Use a blink::RendererPreferences C++ struct for IPC messages
As a precursor to crrev.com/c/2412309, this CL adds a new C++ struct,
along with the relevant mojom traits for typemapping, that will now
be used for IPC between the browser and renderer processes instead
of directly using the blink.mojom.RendererPreferences mojo struct.
This is needed in order to migrate PageMsg_SetRendererPrefs to
Blink (see CL 2412309) since, even thought that message will now
be received and handled inside Blink itself, it's still necessary
to pass it back to //content/renderer as it's still needed in
several places such as RenderView and //content/renderer/loader,
and having the mojom struct only would cause trouble because we
can't simply pass a Blink variant of that struct into //content.
Having this C++ struct and its corresponding typemapping solves this
problem since Blink will no longer receive the Blink variant of the
mojo struct but just a blink::RendererPreferences, which can now be
passed to //content/renderer for as long as it's still needed.
Bug: 1102442
Change-Id: Id79fc6117c6b6a091644f41619aa6467550705cd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2445499
Reviewed-by: Dave Tapuska <[email protected]>
Reviewed-by: Kentaro Hara <[email protected]>
Reviewed-by: Kinuko Yasuda <[email protected]>
Commit-Queue: Mario Sanchez Prada <[email protected]>
Cr-Commit-Position: refs/heads/master@{#819436}
diff --git a/chrome/browser/browser_commands_unittest.cc b/chrome/browser/browser_commands_unittest.cc
index 4ba8644..4c7dfd2a 100644
--- a/chrome/browser/browser_commands_unittest.cc
+++ b/chrome/browser/browser_commands_unittest.cc
@@ -30,7 +30,7 @@
#include "content/public/test/test_renderer_host.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/blink/public/common/page/page_zoom.h"
-#include "third_party/blink/public/mojom/renderer_preferences.mojom.h"
+#include "third_party/blink/public/common/renderer_preferences/renderer_preferences.h"
namespace {
@@ -479,7 +479,7 @@
for (int i = 0; i < tab_count; ++i) {
WebContents* web_contents =
browser()->tab_strip_model()->GetWebContentsAt(i);
- blink::mojom::RendererPreferences* renderer_preferences =
+ blink::RendererPreferences* renderer_preferences =
web_contents->GetMutableRendererPrefs();
EXPECT_TRUE(renderer_preferences->caret_browsing_enabled);
}
@@ -497,7 +497,7 @@
for (int i = 0; i < tab_count; ++i) {
WebContents* web_contents =
browser()->tab_strip_model()->GetWebContentsAt(i);
- blink::mojom::RendererPreferences* renderer_preferences =
+ blink::RendererPreferences* renderer_preferences =
web_contents->GetMutableRendererPrefs();
EXPECT_FALSE(renderer_preferences->caret_browsing_enabled);
}
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 44be095..87f06095 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -350,8 +350,8 @@
#include "third_party/blink/public/common/features.h"
#include "third_party/blink/public/common/loader/referrer_utils.h"
#include "third_party/blink/public/common/loader/url_loader_throttle.h"
+#include "third_party/blink/public/common/renderer_preferences/renderer_preferences.h"
#include "third_party/blink/public/common/switches.h"
-#include "third_party/blink/public/mojom/renderer_preferences.mojom.h"
#include "third_party/blink/public/mojom/site_engagement/site_engagement.mojom.h"
#include "third_party/blink/public/mojom/user_agent/user_agent_metadata.mojom.h"
#include "third_party/blink/public/mojom/webpreferences/web_preferences.mojom.h"
@@ -2468,7 +2468,7 @@
void ChromeContentBrowserClient::UpdateRendererPreferencesForWorker(
content::BrowserContext* browser_context,
- blink::mojom::RendererPreferences* out_prefs) {
+ blink::RendererPreferences* out_prefs) {
DCHECK(browser_context);
DCHECK(out_prefs);
renderer_preferences_util::UpdateFromSystemSettings(
diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h
index 4dbca0a..ee1d227 100644
--- a/chrome/browser/chrome_content_browser_client.h
+++ b/chrome/browser/chrome_content_browser_client.h
@@ -232,7 +232,7 @@
bool IsDataSaverEnabled(content::BrowserContext* context) override;
void UpdateRendererPreferencesForWorker(
content::BrowserContext* browser_context,
- blink::mojom::RendererPreferences* out_prefs) override;
+ blink::RendererPreferences* out_prefs) override;
bool AllowAppCache(const GURL& manifest_url,
const GURL& site_for_cookies,
diff --git a/chrome/browser/chrome_do_not_track_browsertest.cc b/chrome/browser/chrome_do_not_track_browsertest.cc
index 7a5065c3..7a9bf9f4 100644
--- a/chrome/browser/chrome_do_not_track_browsertest.cc
+++ b/chrome/browser/chrome_do_not_track_browsertest.cc
@@ -15,7 +15,7 @@
#include "content/public/test/browser_test.h"
#include "content/public/test/browser_test_utils.h"
#include "net/test/embedded_test_server/embedded_test_server.h"
-#include "third_party/blink/public/mojom/renderer_preferences.mojom.h"
+#include "third_party/blink/public/common/renderer_preferences/renderer_preferences.h"
namespace {
diff --git a/chrome/browser/chromeos/login/ui/webui_login_view.cc b/chrome/browser/chromeos/login/ui/webui_login_view.cc
index df143bc1..d5c0cac 100644
--- a/chrome/browser/chromeos/login/ui/webui_login_view.cc
+++ b/chrome/browser/chromeos/login/ui/webui_login_view.cc
@@ -50,7 +50,7 @@
#include "content/public/browser/web_ui.h"
#include "extensions/browser/view_type_utils.h"
#include "third_party/blink/public/common/input/web_input_event.h"
-#include "third_party/blink/public/mojom/renderer_preferences.mojom.h"
+#include "third_party/blink/public/common/renderer_preferences/renderer_preferences.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/geometry/size.h"
#include "ui/views/controls/webview/web_contents_set_background_color.h"
@@ -172,8 +172,7 @@
extensions::SetViewType(web_contents, extensions::VIEW_TYPE_COMPONENT);
extensions::ChromeExtensionWebContentsObserver::CreateForWebContents(
web_contents);
- blink::mojom::RendererPreferences* prefs =
- web_contents->GetMutableRendererPrefs();
+ blink::RendererPreferences* prefs = web_contents->GetMutableRendererPrefs();
renderer_preferences_util::UpdateFromSystemSettings(
prefs, ProfileHelper::GetSigninProfile());
}
diff --git a/chrome/browser/devtools/devtools_ui_bindings.cc b/chrome/browser/devtools/devtools_ui_bindings.cc
index c0176c6..b1e7a06 100644
--- a/chrome/browser/devtools/devtools_ui_bindings.cc
+++ b/chrome/browser/devtools/devtools_ui_bindings.cc
@@ -82,7 +82,6 @@
#include "services/network/public/cpp/simple_url_loader_stream_consumer.h"
#include "services/network/public/cpp/wrapper_shared_url_loader_factory.h"
#include "services/network/public/mojom/url_response_head.mojom.h"
-#include "third_party/blink/public/mojom/renderer_preferences.mojom.h"
#include "third_party/blink/public/public_buildflags.h"
#include "ui/base/page_transition_types.h"
diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc
index 3e85ed10..f439810d 100644
--- a/chrome/browser/devtools/devtools_window.cc
+++ b/chrome/browser/devtools/devtools_window.cc
@@ -68,7 +68,7 @@
#include "net/base/escape.h"
#include "third_party/blink/public/common/input/web_gesture_event.h"
#include "third_party/blink/public/common/input/web_input_event.h"
-#include "third_party/blink/public/mojom/renderer_preferences.mojom.h"
+#include "third_party/blink/public/common/renderer_preferences/renderer_preferences.h"
#include "third_party/blink/public/public_buildflags.h"
#include "ui/base/page_transition_types.h"
#include "ui/events/keycodes/dom/keycode_converter.h"
diff --git a/chrome/browser/renderer_preferences_util.cc b/chrome/browser/renderer_preferences_util.cc
index ddc3c1d..438df35d 100644
--- a/chrome/browser/renderer_preferences_util.cc
+++ b/chrome/browser/renderer_preferences_util.cc
@@ -21,7 +21,7 @@
#include "content/public/browser/renderer_preferences_util.h"
#include "media/media_buildflags.h"
#include "third_party/blink/public/common/peerconnection/webrtc_ip_handling_policy.h"
-#include "third_party/blink/public/mojom/renderer_preferences.mojom.h"
+#include "third_party/blink/public/common/renderer_preferences/renderer_preferences.h"
#include "third_party/blink/public/public_buildflags.h"
#include "third_party/skia/include/core/SkColor.h"
#include "ui/base/ui_base_features.h"
@@ -94,7 +94,7 @@
namespace renderer_preferences_util {
-void UpdateFromSystemSettings(blink::mojom::RendererPreferences* prefs,
+void UpdateFromSystemSettings(blink::RendererPreferences* prefs,
Profile* profile) {
const PrefService* pref_service = profile->GetPrefs();
if (profile->IsOffTheRecord()) {
diff --git a/chrome/browser/renderer_preferences_util.h b/chrome/browser/renderer_preferences_util.h
index 5fb617d..5150bafd 100644
--- a/chrome/browser/renderer_preferences_util.h
+++ b/chrome/browser/renderer_preferences_util.h
@@ -8,15 +8,13 @@
class Profile;
namespace blink {
-namespace mojom {
-class RendererPreferences;
-}
+struct RendererPreferences;
} // namespace blink
namespace renderer_preferences_util {
// Copies system configuration preferences into |prefs|.
-void UpdateFromSystemSettings(blink::mojom::RendererPreferences* prefs,
+void UpdateFromSystemSettings(blink::RendererPreferences* prefs,
Profile* profile);
} // namespace renderer_preferences_util
diff --git a/chrome/browser/ssl/chrome_security_blocking_page_factory.cc b/chrome/browser/ssl/chrome_security_blocking_page_factory.cc
index 5726307..a7444ff 100644
--- a/chrome/browser/ssl/chrome_security_blocking_page_factory.cc
+++ b/chrome/browser/ssl/chrome_security_blocking_page_factory.cc
@@ -25,7 +25,6 @@
#include "components/security_interstitials/core/controller_client.h"
#include "components/security_interstitials/core/metrics_helper.h"
#include "content/public/browser/web_contents.h"
-#include "third_party/blink/public/mojom/renderer_preferences.mojom.h"
#if defined(OS_WIN)
#include "base/enterprise_util.h"
diff --git a/chrome/browser/ui/ash/assistant/assistant_web_view_impl.cc b/chrome/browser/ui/ash/assistant/assistant_web_view_impl.cc
index 7fa09d2..672d5d41 100644
--- a/chrome/browser/ui/ash/assistant/assistant_web_view_impl.cc
+++ b/chrome/browser/ui/ash/assistant/assistant_web_view_impl.cc
@@ -10,7 +10,7 @@
#include "content/public/browser/render_widget_host_view.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_delegate.h"
-#include "third_party/blink/public/mojom/renderer_preferences.mojom.h"
+#include "third_party/blink/public/common/renderer_preferences/renderer_preferences.h"
#include "ui/aura/window.h"
#include "ui/views/controls/webview/web_contents_set_background_color.h"
#include "ui/views/controls/webview/webview.h"
diff --git a/chrome/browser/ui/extensions/hosted_app_browser_controller.cc b/chrome/browser/ui/extensions/hosted_app_browser_controller.cc
index 46cf9f2f..ec3184e 100644
--- a/chrome/browser/ui/extensions/hosted_app_browser_controller.cc
+++ b/chrome/browser/ui/extensions/hosted_app_browser_controller.cc
@@ -36,7 +36,6 @@
#include "extensions/common/extension.h"
#include "third_party/blink/public/common/web_preferences/web_preferences.h"
#include "third_party/blink/public/mojom/manifest/display_mode.mojom.h"
-#include "third_party/blink/public/mojom/renderer_preferences.mojom.h"
#include "ui/gfx/image/image_skia.h"
#include "url/gurl.h"
diff --git a/chrome/browser/ui/extensions/hosted_app_browsertest.cc b/chrome/browser/ui/extensions/hosted_app_browsertest.cc
index 6f37d81..893f2dc 100644
--- a/chrome/browser/ui/extensions/hosted_app_browsertest.cc
+++ b/chrome/browser/ui/extensions/hosted_app_browsertest.cc
@@ -81,8 +81,8 @@
#include "testing/gtest/include/gtest/gtest-param-test.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/blink/public/common/features.h"
+#include "third_party/blink/public/common/renderer_preferences/renderer_preferences.h"
#include "third_party/blink/public/mojom/manifest/display_mode.mojom.h"
-#include "third_party/blink/public/mojom/renderer_preferences.mojom.h"
using content::RenderFrameHost;
using content::WebContents;
@@ -129,14 +129,12 @@
}
void CheckWebContentsHasAppPrefs(content::WebContents* web_contents) {
- blink::mojom::RendererPreferences* prefs =
- web_contents->GetMutableRendererPrefs();
+ blink::RendererPreferences* prefs = web_contents->GetMutableRendererPrefs();
EXPECT_FALSE(prefs->can_accept_load_drops);
}
void CheckWebContentsDoesNotHaveAppPrefs(content::WebContents* web_contents) {
- blink::mojom::RendererPreferences* prefs =
- web_contents->GetMutableRendererPrefs();
+ blink::RendererPreferences* prefs = web_contents->GetMutableRendererPrefs();
EXPECT_TRUE(prefs->can_accept_load_drops);
}
diff --git a/chrome/browser/ui/prefs/pref_watcher.cc b/chrome/browser/ui/prefs/pref_watcher.cc
index af8ceaa..53c49e2 100644
--- a/chrome/browser/ui/prefs/pref_watcher.cc
+++ b/chrome/browser/ui/prefs/pref_watcher.cc
@@ -14,7 +14,7 @@
#include "chrome/common/pref_names.h"
#include "components/keyed_service/content/browser_context_dependency_manager.h"
#include "components/language/core/browser/pref_names.h"
-#include "third_party/blink/public/mojom/renderer_preferences.mojom.h"
+#include "third_party/blink/public/common/renderer_preferences/renderer_preferences.h"
#if defined(OS_CHROMEOS)
#include "ash/public/cpp/ash_pref_names.h"
@@ -140,10 +140,10 @@
for (auto* helper : tab_helpers_)
helper->UpdateRendererPreferences();
- blink::mojom::RendererPreferences prefs;
+ blink::RendererPreferences prefs;
renderer_preferences_util::UpdateFromSystemSettings(&prefs, profile_);
for (auto& watcher : renderer_preference_watchers_)
- watcher->NotifyUpdate(prefs.Clone());
+ watcher->NotifyUpdate(prefs);
}
void PrefWatcher::OnWebPrefChanged(const std::string& pref_name) {
diff --git a/chrome/browser/ui/prefs/pref_watcher.h b/chrome/browser/ui/prefs/pref_watcher.h
index a439b2ce..78d5b76 100644
--- a/chrome/browser/ui/prefs/pref_watcher.h
+++ b/chrome/browser/ui/prefs/pref_watcher.h
@@ -15,8 +15,8 @@
class Profile;
class PrefsTabHelper;
-// Watches updates in WebKitPreferences and blink::mojom::RendererPreferences,
-// and notifies tab helpers and registered watchers of those updates.
+// Watches updates in WebKitPreferences and blink::RendererPreferences, and
+// notifies tab helpers and registered watchers of those updates.
class PrefWatcher : public KeyedService {
public:
explicit PrefWatcher(Profile* profile);
@@ -42,11 +42,11 @@
PrefChangeRegistrar local_state_pref_change_registrar_;
// |tab_helpers_| observe changes in WebKitPreferences and
- // blink::mojom::RendererPreferences.
+ // blink::RendererPreferences.
std::set<PrefsTabHelper*> tab_helpers_;
// |renderer_preference_watchers_| observe changes in
- // blink::mojom::RendererPreferences. If the consumer also wants to WebKit
+ // blink::RendererPreferences. If the consumer also wants to WebKit
// preference changes, use |tab_helpers_|.
mojo::RemoteSet<blink::mojom::RendererPreferenceWatcher>
renderer_preference_watchers_;
diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/prefs/prefs_tab_helper.cc
index 97d147c..4a60728 100644
--- a/chrome/browser/ui/prefs/prefs_tab_helper.cc
+++ b/chrome/browser/ui/prefs/prefs_tab_helper.cc
@@ -43,8 +43,8 @@
#include "extensions/buildflags/buildflags.h"
#include "media/media_buildflags.h"
#include "third_party/blink/public/common/features.h"
+#include "third_party/blink/public/common/renderer_preferences/renderer_preferences.h"
#include "third_party/blink/public/common/web_preferences/web_preferences.h"
-#include "third_party/blink/public/mojom/renderer_preferences.mojom.h"
#include "third_party/icu/source/common/unicode/uchar.h"
#include "third_party/icu/source/common/unicode/uscript.h"
#include "ui/base/l10n/l10n_util.h"
@@ -314,7 +314,7 @@
PrefWatcher::Get(profile_)->RegisterHelper(this);
}
- blink::mojom::RendererPreferences* render_prefs =
+ blink::RendererPreferences* render_prefs =
web_contents_->GetMutableRendererPrefs();
renderer_preferences_util::UpdateFromSystemSettings(render_prefs, profile_);
@@ -448,8 +448,7 @@
}
void PrefsTabHelper::UpdateRendererPreferences() {
- blink::mojom::RendererPreferences* prefs =
- web_contents_->GetMutableRendererPrefs();
+ blink::RendererPreferences* prefs = web_contents_->GetMutableRendererPrefs();
renderer_preferences_util::UpdateFromSystemSettings(prefs, profile_);
web_contents_->SyncRendererPrefs();
}
diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.h b/chrome/browser/ui/prefs/prefs_tab_helper.h
index 8e28476..9bedc7c 100644
--- a/chrome/browser/ui/prefs/prefs_tab_helper.h
+++ b/chrome/browser/ui/prefs/prefs_tab_helper.h
@@ -51,7 +51,7 @@
const content::NotificationSource& source,
const content::NotificationDetails& details) override;
- // Update the WebContents's blink::mojom::RendererPreferences.
+ // Update the WebContents's blink::RendererPreferences.
void UpdateRendererPreferences();
void OnFontFamilyPrefChanged(const std::string& pref_name);
diff --git a/chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc b/chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc
index 7a23e7d..6f6f4c0 100644
--- a/chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc
+++ b/chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc
@@ -283,8 +283,7 @@
WebContentsObserver::Observe(web_contents_);
zoom::ZoomController::CreateForWebContents(web_contents_);
web_contents_->SetDelegate(override_tab_delegate_.get());
- blink::mojom::RendererPreferences* prefs =
- web_contents_->GetMutableRendererPrefs();
+ blink::RendererPreferences* prefs = web_contents_->GetMutableRendererPrefs();
renderer_preferences_util::UpdateFromSystemSettings(
prefs, Profile::FromBrowserContext(browser_context));
diff --git a/chrome/browser/ui/web_applications/web_app_launch_manager.cc b/chrome/browser/ui/web_applications/web_app_launch_manager.cc
index 3befff5..e07789f 100644
--- a/chrome/browser/ui/web_applications/web_app_launch_manager.cc
+++ b/chrome/browser/ui/web_applications/web_app_launch_manager.cc
@@ -45,7 +45,6 @@
#include "content/public/common/referrer.h"
#include "extensions/common/constants.h"
#include "third_party/blink/public/common/features.h"
-#include "third_party/blink/public/mojom/renderer_preferences.mojom.h"
#include "ui/base/page_transition_types.h"
#include "ui/base/window_open_disposition.h"
#include "ui/display/scoped_display_for_new_windows.h"
diff --git a/chrome/browser/ui/web_applications/web_app_launch_utils.cc b/chrome/browser/ui/web_applications/web_app_launch_utils.cc
index cd1862e8..b7af783 100644
--- a/chrome/browser/ui/web_applications/web_app_launch_utils.cc
+++ b/chrome/browser/ui/web_applications/web_app_launch_utils.cc
@@ -22,7 +22,7 @@
#include "content/public/browser/navigation_controller.h"
#include "content/public/browser/navigation_entry.h"
#include "content/public/browser/web_contents.h"
-#include "third_party/blink/public/mojom/renderer_preferences.mojom.h"
+#include "third_party/blink/public/common/renderer_preferences/renderer_preferences.h"
#include "url/gurl.h"
namespace {
