Use mojom-forward.h for browser_process_impl.cc
I replaced mojom.h header in files used for compiling browser_process_impl.cc with mojom-forward.h as many as possible.
To fix build failure, I added mojo header files in some cc files too.
This CL improved compile time of browser_process_impl.cc from 14.5s to 13.1s on Linux.
[email protected], [email protected]
Bug: 922875
Change-Id: I5311b82f66e97aa7baf5e7a41d2e6358dd670ea3
Reviewed-on: https://chromium-review.googlesource.com/c/1451603
Commit-Queue: Takuto Ikuta <[email protected]>
Reviewed-by: Ken Rockot <[email protected]>
Reviewed-by: Nico Weber <[email protected]>
Cr-Commit-Position: refs/heads/master@{#629441}diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS
index bd19ab1..dcf421a 100644
--- a/chrome/browser/DEPS
+++ b/chrome/browser/DEPS
@@ -196,8 +196,8 @@
# Allow mojo generated files in WebKit. These files use STL types and
# don't use WTF types.
"+third_party/blink/public/platform/autoplay.mojom.h",
- "+third_party/blink/public/platform/web_feature.mojom.h",
"+third_party/blink/public/platform/modules/app_banner/app_banner.mojom.h",
+ "+third_party/blink/public/platform/modules/badging/badging.mojom.h",
"+third_party/blink/public/platform/modules/budget_service/budget_service.mojom.h",
"+third_party/blink/public/platform/modules/insecure_input/insecure_input_service.mojom.h",
"+third_party/blink/public/platform/modules/installation/installation.mojom.h",
@@ -206,9 +206,10 @@
"+third_party/blink/public/platform/modules/presentation/presentation.mojom.h",
"+third_party/blink/public/platform/modules/webauthn/authenticator.mojom.h",
"+third_party/blink/public/platform/modules/webshare/webshare.mojom.h",
- "+third_party/blink/public/platform/modules/badging/badging.mojom.h",
"+third_party/blink/public/platform/oom_intervention.mojom.h",
"+third_party/blink/public/platform/site_engagement.mojom.h",
+ "+third_party/blink/public/platform/web_feature.mojom-shared.h",
+ "+third_party/blink/public/platform/web_feature.mojom.h",
"+third_party/blink/public/web/window_features.mojom.h",
# The following restrictions are for ChromeOS and in particular mus/mash where
diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
index d70dd33f..7168c719 100644
--- a/chrome/browser/browser_process_impl.h
+++ b/chrome/browser/browser_process_impl.h
@@ -33,7 +33,7 @@
#include "ppapi/buildflags/buildflags.h"
#include "printing/buildflags/buildflags.h"
#include "services/network/public/cpp/network_quality_tracker.h"
-#include "services/network/public/mojom/network_service.mojom.h"
+#include "services/network/public/mojom/network_service.mojom-forward.h"
class ChromeChildProcessWatcher;
class ChromeDeviceClient;
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 36fc074..6197331 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -294,6 +294,7 @@
#include "content/public/common/url_utils.h"
#include "content/public/common/user_agent.h"
#include "content/public/common/web_preferences.h"
+#include "content/public/common/window_container_type.mojom-shared.h"
#include "device/vr/buildflags/buildflags.h"
#include "extensions/buildflags/buildflags.h"
#include "google_apis/gaia/gaia_urls.h"
diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h
index f9c37fb2..bce086d7 100644
--- a/chrome/browser/chrome_content_browser_client.h
+++ b/chrome/browser/chrome_content_browser_client.h
@@ -26,7 +26,7 @@
#include "extensions/buildflags/buildflags.h"
#include "media/media_buildflags.h"
#include "ppapi/buildflags/buildflags.h"
-#include "services/network/public/mojom/network_context.mojom.h"
+#include "services/network/public/mojom/network_context.mojom-forward.h"
#include "services/service_manager/public/cpp/binder_registry.h"
class ChromeContentBrowserClientParts;
diff --git a/chrome/browser/chrome_navigation_browsertest.cc b/chrome/browser/chrome_navigation_browsertest.cc
index b2a651a..cfc7688 100644
--- a/chrome/browser/chrome_navigation_browsertest.cc
+++ b/chrome/browser/chrome_navigation_browsertest.cc
@@ -49,6 +49,7 @@
#include "net/dns/mock_host_resolver.h"
#include "services/metrics/public/cpp/ukm_builders.h"
#include "services/network/public/cpp/features.h"
+#include "third_party/blink/public/platform/web_feature.mojom-shared.h"
class ChromeNavigationBrowserTest : public InProcessBrowserTest {
public:
diff --git a/chrome/browser/chrome_service.h b/chrome/browser/chrome_service.h
index f53a9ced..8cacb2f 100644
--- a/chrome/browser/chrome_service.h
+++ b/chrome/browser/chrome_service.h
@@ -8,7 +8,7 @@
#include "base/no_destructor.h"
#include "content/public/common/service_manager_connection.h"
#include "mojo/public/cpp/system/message_pipe.h"
-#include "services/service_manager/public/mojom/service.mojom.h"
+#include "services/service_manager/public/mojom/service.mojom-forward.h"
namespace service_manager {
class Connector;
diff --git a/chrome/browser/chromeos/android_sms/fcm_connection_establisher.cc b/chrome/browser/chromeos/android_sms/fcm_connection_establisher.cc
index 5d68e47c..7a9cb7d 100644
--- a/chrome/browser/chromeos/android_sms/fcm_connection_establisher.cc
+++ b/chrome/browser/chromeos/android_sms/fcm_connection_establisher.cc
@@ -13,6 +13,7 @@
#include "content/public/browser/browser_task_traits.h"
#include "content/public/browser/browser_thread.h"
#include "third_party/blink/public/common/messaging/string_message_codec.h"
+#include "third_party/blink/public/common/messaging/transferable_message.h"
namespace chromeos {
diff --git a/chrome/browser/chromeos/android_sms/fcm_connection_establisher_unittest.cc b/chrome/browser/chromeos/android_sms/fcm_connection_establisher_unittest.cc
index 12c95b7..f06a1e9 100644
--- a/chrome/browser/chromeos/android_sms/fcm_connection_establisher_unittest.cc
+++ b/chrome/browser/chromeos/android_sms/fcm_connection_establisher_unittest.cc
@@ -15,6 +15,7 @@
#include "content/public/test/test_browser_thread_bundle.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/blink/public/common/messaging/string_message_codec.h"
+#include "third_party/blink/public/common/messaging/transferable_message.h"
namespace chromeos {
diff --git a/chrome/browser/chromeos/android_sms/streaming_connection_establisher.cc b/chrome/browser/chromeos/android_sms/streaming_connection_establisher.cc
index 13ab0b2..0c9216e 100644
--- a/chrome/browser/chromeos/android_sms/streaming_connection_establisher.cc
+++ b/chrome/browser/chromeos/android_sms/streaming_connection_establisher.cc
@@ -13,6 +13,7 @@
#include "content/public/browser/browser_task_traits.h"
#include "content/public/browser/browser_thread.h"
#include "third_party/blink/public/common/messaging/string_message_codec.h"
+#include "third_party/blink/public/common/messaging/transferable_message.h"
namespace chromeos {
diff --git a/chrome/browser/chromeos/android_sms/streaming_connection_establisher_unittest.cc b/chrome/browser/chromeos/android_sms/streaming_connection_establisher_unittest.cc
index 326be53..13fbd8e7 100644
--- a/chrome/browser/chromeos/android_sms/streaming_connection_establisher_unittest.cc
+++ b/chrome/browser/chromeos/android_sms/streaming_connection_establisher_unittest.cc
@@ -13,6 +13,7 @@
#include "content/public/test/test_browser_thread_bundle.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/blink/public/common/messaging/string_message_codec.h"
+#include "third_party/blink/public/common/messaging/transferable_message.h"
namespace chromeos {
diff --git a/chrome/browser/chromeos/first_run/drive_first_run_controller.cc b/chrome/browser/chromeos/first_run/drive_first_run_controller.cc
index 49c8f6f..bcf65ed 100644
--- a/chrome/browser/chromeos/first_run/drive_first_run_controller.cc
+++ b/chrome/browser/chromeos/first_run/drive_first_run_controller.cc
@@ -40,6 +40,7 @@
#include "content/public/browser/site_instance.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_observer.h"
+#include "content/public/common/window_container_type.mojom-shared.h"
#include "extensions/browser/extension_registry.h"
#include "extensions/browser/extension_system.h"
#include "extensions/common/extension.h"
diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h
index 95e97e8..0835488 100644
--- a/chrome/browser/io_thread.h
+++ b/chrome/browser/io_thread.h
@@ -29,7 +29,7 @@
#include "content/public/browser/browser_thread_delegate.h"
#include "extensions/buildflags/buildflags.h"
#include "net/base/network_change_notifier.h"
-#include "services/network/public/mojom/network_service.mojom.h"
+#include "services/network/public/mojom/network_service.mojom-forward.h"
#include "services/network/url_request_context_owner.h"
class PrefRegistrySimple;
diff --git a/chrome/browser/media/cast_mirroring_service_host.cc b/chrome/browser/media/cast_mirroring_service_host.cc
index 8571183..1a90ee91 100644
--- a/chrome/browser/media/cast_mirroring_service_host.cc
+++ b/chrome/browser/media/cast_mirroring_service_host.cc
@@ -31,6 +31,7 @@
#include "content/public/browser/web_contents.h"
#include "content/public/common/service_manager_connection.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
+#include "services/network/public/mojom/network_service.mojom.h"
#include "services/service_manager/public/cpp/connector.h"
#include "ui/display/display.h"
#include "ui/display/screen.h"
diff --git a/chrome/browser/media/webrtc/webrtc_event_log_uploader.h b/chrome/browser/media/webrtc/webrtc_event_log_uploader.h
index 0429ece..f0699503 100644
--- a/chrome/browser/media/webrtc/webrtc_event_log_uploader.h
+++ b/chrome/browser/media/webrtc/webrtc_event_log_uploader.h
@@ -13,7 +13,7 @@
#include "base/sequenced_task_runner.h"
#include "chrome/browser/media/webrtc/webrtc_event_log_history.h"
#include "chrome/browser/media/webrtc/webrtc_event_log_manager_common.h"
-#include "services/network/public/mojom/url_loader_factory.mojom.h"
+#include "services/network/public/mojom/url_loader_factory.mojom-forward.h"
namespace network {
class SimpleURLLoader;
diff --git a/chrome/browser/net/chrome_mojo_proxy_resolver_factory_browsertest.cc b/chrome/browser/net/chrome_mojo_proxy_resolver_factory_browsertest.cc
index 174e1861..8f23df5 100644
--- a/chrome/browser/net/chrome_mojo_proxy_resolver_factory_browsertest.cc
+++ b/chrome/browser/net/chrome_mojo_proxy_resolver_factory_browsertest.cc
@@ -20,6 +20,7 @@
#include "content/public/common/service_manager_connection.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "services/proxy_resolver/public/mojom/proxy_resolver.mojom.h"
+#include "services/service_manager/public/mojom/service_manager.mojom.h"
namespace {
diff --git a/chrome/browser/net/chrome_network_service_browsertest.cc b/chrome/browser/net/chrome_network_service_browsertest.cc
index 0d6d4933..4d3847d 100644
--- a/chrome/browser/net/chrome_network_service_browsertest.cc
+++ b/chrome/browser/net/chrome_network_service_browsertest.cc
@@ -15,6 +15,7 @@
#include "content/public/test/browser_test.h"
#include "net/extras/sqlite/cookie_crypto_delegate.h"
#include "services/network/public/cpp/features.h"
+#include "services/network/public/mojom/network_service.mojom.h"
#if defined(OS_MACOSX)
#include "base/mac/mac_util.h"
diff --git a/chrome/browser/net/profile_network_context_service.cc b/chrome/browser/net/profile_network_context_service.cc
index ca0cea0..d0d1e5a 100644
--- a/chrome/browser/net/profile_network_context_service.cc
+++ b/chrome/browser/net/profile_network_context_service.cc
@@ -43,6 +43,7 @@
#include "net/http/http_util.h"
#include "services/network/public/cpp/cors/origin_access_list.h"
#include "services/network/public/cpp/features.h"
+#include "services/network/public/mojom/network_service.mojom.h"
#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/policy/policy_cert_service.h"
diff --git a/chrome/browser/net/proxy_config_monitor.h b/chrome/browser/net/proxy_config_monitor.h
index c6c1fa51..0f20947 100644
--- a/chrome/browser/net/proxy_config_monitor.h
+++ b/chrome/browser/net/proxy_config_monitor.h
@@ -14,8 +14,10 @@
#include "mojo/public/cpp/bindings/binding_set.h"
#include "mojo/public/cpp/bindings/interface_ptr_set.h"
#include "net/proxy_resolution/proxy_config_service.h"
-#include "services/network/public/mojom/network_service.mojom.h"
-#include "services/network/public/mojom/proxy_config.mojom.h"
+#include "services/network/public/mojom/network_context.mojom-forward.h"
+#include "services/network/public/mojom/network_service.mojom-forward.h"
+#include "services/network/public/mojom/proxy_config.mojom-forward.h"
+#include "services/network/public/mojom/proxy_config_with_annotation.mojom.h"
namespace net {
class ProxyConfigWithAnnotation;
diff --git a/chrome/browser/net/system_network_context_manager.h b/chrome/browser/net/system_network_context_manager.h
index 78224376..721c6a05 100644
--- a/chrome/browser/net/system_network_context_manager.h
+++ b/chrome/browser/net/system_network_context_manager.h
@@ -15,8 +15,11 @@
#include "chrome/browser/net/proxy_config_monitor.h"
#include "components/prefs/pref_change_registrar.h"
#include "components/prefs/pref_member.h"
-#include "services/network/public/mojom/network_service.mojom.h"
-#include "services/network/public/mojom/ssl_config.mojom.h"
+#include "services/network/public/mojom/host_resolver.mojom-forward.h"
+#include "services/network/public/mojom/network_context.mojom.h"
+#include "services/network/public/mojom/network_service.mojom-forward.h"
+#include "services/network/public/mojom/ssl_config.mojom-forward.h"
+#include "services/network/public/mojom/url_loader_factory.mojom-forward.h"
class PrefRegistrySimple;
class PrefService;
diff --git a/chrome/browser/net/system_network_context_manager_browsertest.cc b/chrome/browser/net/system_network_context_manager_browsertest.cc
index cbf7395b..1ed10920 100644
--- a/chrome/browser/net/system_network_context_manager_browsertest.cc
+++ b/chrome/browser/net/system_network_context_manager_browsertest.cc
@@ -18,6 +18,7 @@
#include "chrome/test/base/in_process_browser_test.h"
#include "components/prefs/pref_service.h"
#include "services/network/public/mojom/network_context.mojom.h"
+#include "services/network/public/mojom/network_service.mojom.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/page_load_metrics/metrics_web_contents_observer.cc b/chrome/browser/page_load_metrics/metrics_web_contents_observer.cc
index d10d2dd..b9aef6d 100644
--- a/chrome/browser/page_load_metrics/metrics_web_contents_observer.cc
+++ b/chrome/browser/page_load_metrics/metrics_web_contents_observer.cc
@@ -29,6 +29,7 @@
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_observer.h"
#include "content/public/browser/web_contents_user_data.h"
+#include "content/public/common/resource_load_info.mojom.h"
#include "net/base/net_errors.h"
#include "services/network/public/cpp/features.h"
#include "ui/base/page_transition_types.h"
diff --git a/chrome/browser/prefs/chrome_pref_service_factory.h b/chrome/browser/prefs/chrome_pref_service_factory.h
index b752929..26741a40 100644
--- a/chrome/browser/prefs/chrome_pref_service_factory.h
+++ b/chrome/browser/prefs/chrome_pref_service_factory.h
@@ -10,7 +10,7 @@
#include "base/memory/ref_counted.h"
#include "components/prefs/persistent_pref_store.h"
#include "components/prefs/pref_value_store.h"
-#include "services/preferences/public/mojom/tracked_preference_validation_delegate.mojom.h"
+#include "services/preferences/public/mojom/tracked_preference_validation_delegate.mojom-forward.h"
namespace base {
class DictionaryValue;
diff --git a/chrome/browser/profiles/profile.h b/chrome/browser/profiles/profile.h
index 1109975d..41eae2e 100644
--- a/chrome/browser/profiles/profile.h
+++ b/chrome/browser/profiles/profile.h
@@ -16,7 +16,7 @@
#include "components/domain_reliability/clear_mode.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/content_browser_client.h"
-#include "services/network/public/mojom/network_service.mojom.h"
+#include "services/network/public/mojom/network_service.mojom-forward.h"
#if !defined(OS_ANDROID)
class ChromeZoomLevelPrefs;
diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc b/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc
index dd66153..ae39208 100644
--- a/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc
@@ -62,6 +62,7 @@
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/render_widget_host.h"
#include "content/public/browser/web_contents.h"
+#include "content/public/common/resource_load_info.mojom.h"
#include "content/public/test/browser_test_utils.h"
#include "content/public/test/test_utils.h"
#include "extensions/browser/api/extensions_api_client.h"
diff --git a/chrome/browser/resource_coordinator/lifecycle_unit.h b/chrome/browser/resource_coordinator/lifecycle_unit.h
index cdfacef..b3b874c8 100644
--- a/chrome/browser/resource_coordinator/lifecycle_unit.h
+++ b/chrome/browser/resource_coordinator/lifecycle_unit.h
@@ -14,7 +14,7 @@
#include "base/strings/string16.h"
#include "base/time/time.h"
#include "chrome/browser/resource_coordinator/decision_details.h"
-#include "chrome/browser/resource_coordinator/lifecycle_unit_state.mojom.h"
+#include "chrome/browser/resource_coordinator/lifecycle_unit_state.mojom-forward.h"
#include "content/public/browser/visibility.h"
#include "services/metrics/public/cpp/ukm_source_id.h"
diff --git a/chrome/browser/resource_coordinator/lifecycle_unit_base.h b/chrome/browser/resource_coordinator/lifecycle_unit_base.h
index daed664..4c1a48698 100644
--- a/chrome/browser/resource_coordinator/lifecycle_unit_base.h
+++ b/chrome/browser/resource_coordinator/lifecycle_unit_base.h
@@ -8,6 +8,7 @@
#include "base/macros.h"
#include "base/observer_list.h"
#include "chrome/browser/resource_coordinator/lifecycle_unit.h"
+#include "chrome/browser/resource_coordinator/lifecycle_unit_state.mojom-shared.h"
#include "chrome/browser/resource_coordinator/time.h"
#include "content/public/browser/visibility.h"
diff --git a/chrome/browser/resource_coordinator/lifecycle_unit_observer.h b/chrome/browser/resource_coordinator/lifecycle_unit_observer.h
index 4ef437c..18a04c4 100644
--- a/chrome/browser/resource_coordinator/lifecycle_unit_observer.h
+++ b/chrome/browser/resource_coordinator/lifecycle_unit_observer.h
@@ -5,7 +5,7 @@
#ifndef CHROME_BROWSER_RESOURCE_COORDINATOR_LIFECYCLE_UNIT_OBSERVER_H_
#define CHROME_BROWSER_RESOURCE_COORDINATOR_LIFECYCLE_UNIT_OBSERVER_H_
-#include "chrome/browser/resource_coordinator/lifecycle_unit_state.mojom.h"
+#include "chrome/browser/resource_coordinator/lifecycle_unit_state.mojom-forward.h"
#include "content/public/browser/visibility.h"
namespace resource_coordinator {
diff --git a/chrome/browser/resource_coordinator/local_site_characteristics_data_unittest_utils.h b/chrome/browser/resource_coordinator/local_site_characteristics_data_unittest_utils.h
index e0afa9e..74cabd81 100644
--- a/chrome/browser/resource_coordinator/local_site_characteristics_data_unittest_utils.h
+++ b/chrome/browser/resource_coordinator/local_site_characteristics_data_unittest_utils.h
@@ -13,6 +13,7 @@
#include "chrome/browser/resource_coordinator/local_site_characteristics_database.h"
#include "chrome/test/base/chrome_render_view_host_test_harness.h"
#include "content/public/common/service_manager_connection.h"
+#include "services/service_manager/public/mojom/service.mojom.h"
#include "testing/gmock/include/gmock/gmock.h"
namespace content {
diff --git a/chrome/browser/resource_coordinator/page_signal_receiver_unittest.cc b/chrome/browser/resource_coordinator/page_signal_receiver_unittest.cc
index 43a96fa0..cf988bc 100644
--- a/chrome/browser/resource_coordinator/page_signal_receiver_unittest.cc
+++ b/chrome/browser/resource_coordinator/page_signal_receiver_unittest.cc
@@ -10,6 +10,7 @@
#include "content/public/browser/browser_thread.h"
#include "content/public/common/service_manager_connection.h"
#include "content/public/test/web_contents_tester.h"
+#include "services/service_manager/public/mojom/service.mojom.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace resource_coordinator {
diff --git a/chrome/browser/resource_coordinator/tab_load_tracker.h b/chrome/browser/resource_coordinator/tab_load_tracker.h
index 66c9f45..a7dd37b0 100644
--- a/chrome/browser/resource_coordinator/tab_load_tracker.h
+++ b/chrome/browser/resource_coordinator/tab_load_tracker.h
@@ -13,7 +13,7 @@
#include "base/process/kill.h"
#include "base/sequence_checker.h"
#include "base/strings/string16.h"
-#include "chrome/browser/resource_coordinator/lifecycle_unit_state.mojom.h"
+#include "chrome/browser/resource_coordinator/lifecycle_unit_state.mojom-shared.h"
namespace content {
class WebContents;
diff --git a/chrome/browser/resource_coordinator/tab_manager.h b/chrome/browser/resource_coordinator/tab_manager.h
index b7bea32..0c9f1d4 100644
--- a/chrome/browser/resource_coordinator/tab_manager.h
+++ b/chrome/browser/resource_coordinator/tab_manager.h
@@ -24,7 +24,7 @@
#include "chrome/browser/resource_coordinator/lifecycle_unit.h"
#include "chrome/browser/resource_coordinator/lifecycle_unit_observer.h"
#include "chrome/browser/resource_coordinator/lifecycle_unit_source_observer.h"
-#include "chrome/browser/resource_coordinator/lifecycle_unit_state.mojom.h"
+#include "chrome/browser/resource_coordinator/lifecycle_unit_state.mojom-forward.h"
#include "chrome/browser/resource_coordinator/tab_lifecycle_observer.h"
#include "chrome/browser/resource_coordinator/tab_load_tracker.h"
#include "chrome/browser/resource_coordinator/tab_manager_features.h"
diff --git a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc
index c90b2c83..c08c02e 100644
--- a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc
+++ b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc
@@ -32,6 +32,7 @@
#include "content/public/browser/navigation_entry.h"
#include "content/public/browser/render_frame_host.h"
#include "content/public/browser/web_contents.h"
+#include "content/public/common/resource_load_info.mojom.h"
#include "content/public/test/mock_render_process_host.h"
#include "content/public/test/navigation_simulator.h"
#include "content/public/test/test_browser_thread.h"
diff --git a/chrome/browser/safe_browsing/safe_browsing_service.h b/chrome/browser/safe_browsing/safe_browsing_service.h
index e2d98337..0d6d8cf 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service.h
+++ b/chrome/browser/safe_browsing/safe_browsing_service.h
@@ -27,6 +27,7 @@
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
#include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h"
+#include "services/network/public/mojom/network_context.mojom-forward.h"
#if defined(FULL_SAFE_BROWSING)
#include "chrome/browser/safe_browsing/incident_reporting/delayed_analysis_callback.h"
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 49ea4a9..559a297c 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -201,6 +201,7 @@
#include "content/public/common/page_zoom.h"
#include "content/public/common/profiling.h"
#include "content/public/common/webplugininfo.h"
+#include "content/public/common/window_container_type.mojom-shared.h"
#include "extensions/browser/extension_prefs.h"
#include "extensions/browser/extension_registry.h"
#include "extensions/browser/extension_system.h"
diff --git a/chrome/common/extensions/DEPS b/chrome/common/extensions/DEPS
index 02c7d42b..9c4e09aa 100644
--- a/chrome/common/extensions/DEPS
+++ b/chrome/common/extensions/DEPS
@@ -13,5 +13,6 @@
# API schemas exist, so it needs to know about app APIs.
"chrome_extensions_client\.cc": [
"+apps/common/api/generated_schemas.h",
+ "+services/network/public/mojom/cors_origin_pattern.mojom.h",
],
}
diff --git a/chrome/common/extensions/chrome_extensions_client.cc b/chrome/common/extensions/chrome_extensions_client.cc
index 5ffa260..ca4cd15 100644
--- a/chrome/common/extensions/chrome_extensions_client.cc
+++ b/chrome/common/extensions/chrome_extensions_client.cc
@@ -36,6 +36,7 @@
#include "extensions/common/permissions/permissions_data.h"
#include "extensions/common/url_pattern.h"
#include "extensions/common/url_pattern_set.h"
+#include "services/network/public/mojom/cors_origin_pattern.mojom.h"
#include "ui/base/l10n/l10n_util.h"
#include "url/gurl.h"
diff --git a/chromecast/browser/cast_content_browser_client.h b/chromecast/browser/cast_content_browser_client.h
index da4eca0..5acae19 100644
--- a/chromecast/browser/cast_content_browser_client.h
+++ b/chromecast/browser/cast_content_browser_client.h
@@ -19,6 +19,7 @@
#include "content/public/browser/certificate_request_result_type.h"
#include "content/public/browser/content_browser_client.h"
#include "services/service_manager/public/cpp/binder_registry.h"
+#include "services/service_manager/public/mojom/interface_provider.mojom-forward.h"
class PrefService;
diff --git a/chromecast/browser/extensions/cast_extensions_browser_client.cc b/chromecast/browser/extensions/cast_extensions_browser_client.cc
index e0ef089..16bd243 100644
--- a/chromecast/browser/extensions/cast_extensions_browser_client.cc
+++ b/chromecast/browser/extensions/cast_extensions_browser_client.cc
@@ -31,6 +31,7 @@
#include "extensions/browser/updater/null_extension_cache.h"
#include "extensions/browser/url_request_util.h"
#include "extensions/common/features/feature_channel.h"
+#include "services/network/public/mojom/url_loader.mojom.h"
using content::BrowserContext;
using content::BrowserThread;
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_service.h b/components/data_reduction_proxy/core/browser/data_reduction_proxy_service.h
index 3d7ef53..48dda57 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_service.h
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_service.h
@@ -25,6 +25,7 @@
#include "services/network/public/cpp/network_connection_tracker.h"
#include "services/network/public/cpp/network_quality_tracker.h"
#include "services/network/public/cpp/shared_url_loader_factory.h"
+#include "services/network/public/mojom/network_context.mojom-forward.h"
class PrefService;
@@ -37,6 +38,7 @@
namespace net {
class HttpRequestHeaders;
class URLRequestContextGetter;
+class ProxyList;
}
namespace data_reduction_proxy {
diff --git a/components/gcm_driver/gcm_client.h b/components/gcm_driver/gcm_client.h
index 874cd360..3a616e1 100644
--- a/components/gcm_driver/gcm_client.h
+++ b/components/gcm_driver/gcm_client.h
@@ -16,7 +16,7 @@
#include "components/gcm_driver/common/gcm_messages.h"
#include "components/gcm_driver/gcm_activity.h"
#include "components/gcm_driver/registration_info.h"
-#include "services/network/public/mojom/proxy_resolving_socket.mojom.h"
+#include "services/network/public/mojom/proxy_resolving_socket.mojom-forward.h"
namespace base {
class FilePath;
diff --git a/components/gcm_driver/gcm_desktop_utils.h b/components/gcm_driver/gcm_desktop_utils.h
index 3681597..cca3e851 100644
--- a/components/gcm_driver/gcm_desktop_utils.h
+++ b/components/gcm_driver/gcm_desktop_utils.h
@@ -10,7 +10,7 @@
#include "base/memory/ref_counted.h"
#include "base/sequenced_task_runner.h"
#include "components/version_info/version_info.h"
-#include "services/network/public/mojom/proxy_resolving_socket.mojom.h"
+#include "services/network/public/mojom/proxy_resolving_socket.mojom-forward.h"
class PrefService;
namespace base {
diff --git a/components/offline_pages/content/background_loader/DEPS b/components/offline_pages/content/background_loader/DEPS
index d79a7d0..b54fdf66 100644
--- a/components/offline_pages/content/background_loader/DEPS
+++ b/components/offline_pages/content/background_loader/DEPS
@@ -1,4 +1,5 @@
include_rules = [
"+content/public/browser",
"+content/public/test",
+ "+content/public/common/window_container_type.mojom-shared.h",
]
diff --git a/components/offline_pages/content/background_loader/background_loader_contents_unittest.cc b/components/offline_pages/content/background_loader/background_loader_contents_unittest.cc
index d6e247d..c2be7aed 100644
--- a/components/offline_pages/content/background_loader/background_loader_contents_unittest.cc
+++ b/components/offline_pages/content/background_loader/background_loader_contents_unittest.cc
@@ -7,6 +7,7 @@
#include "base/bind.h"
#include "base/synchronization/waitable_event.h"
#include "content/public/browser/web_contents.h"
+#include "content/public/common/window_container_type.mojom-shared.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "url/gurl.h"
diff --git a/components/storage_monitor/storage_monitor.h b/components/storage_monitor/storage_monitor.h
index 250a5ed1..f7f88e6f 100644
--- a/components/storage_monitor/storage_monitor.h
+++ b/components/storage_monitor/storage_monitor.h
@@ -21,7 +21,7 @@
#include "services/service_manager/public/cpp/connector.h"
#if defined(OS_CHROMEOS)
-#include "services/device/public/mojom/mtp_manager.mojom.h"
+#include "services/device/public/mojom/mtp_manager.mojom-forward.h"
#endif
class MediaFileSystemRegistryTest;
diff --git a/components/storage_monitor/test_storage_monitor.h b/components/storage_monitor/test_storage_monitor.h
index ead83604..d851e14 100644
--- a/components/storage_monitor/test_storage_monitor.h
+++ b/components/storage_monitor/test_storage_monitor.h
@@ -12,6 +12,10 @@
#include "build/build_config.h"
#include "components/storage_monitor/storage_monitor.h"
+#if defined(OS_CHROMEOS)
+#include "services/device/public/mojom/mtp_manager.mojom.h"
+#endif
+
namespace storage_monitor {
class TestStorageMonitor : public StorageMonitor {
diff --git a/components/subresource_filter/core/browser/subresource_filter_features.cc b/components/subresource_filter/core/browser/subresource_filter_features.cc
index a0cc546..3555c7f0 100644
--- a/components/subresource_filter/core/browser/subresource_filter_features.cc
+++ b/components/subresource_filter/core/browser/subresource_filter_features.cc
@@ -21,6 +21,7 @@
#include "base/time/time.h"
#include "base/trace_event/traced_value.h"
#include "components/subresource_filter/core/common/common_features.h"
+#include "components/subresource_filter/core/mojom/subresource_filter.mojom.h"
namespace subresource_filter {
diff --git a/components/ukm/debug/ukm_debug_data_extractor.cc b/components/ukm/debug/ukm_debug_data_extractor.cc
index f26e9e4..f858bcda 100644
--- a/components/ukm/debug/ukm_debug_data_extractor.cc
+++ b/components/ukm/debug/ukm_debug_data_extractor.cc
@@ -13,6 +13,7 @@
#include "base/strings/stringprintf.h"
#include "services/metrics/public/cpp/ukm_decode.h"
#include "services/metrics/public/cpp/ukm_source.h"
+#include "services/metrics/public/mojom/ukm_interface.mojom.h"
#include "url/gurl.h"
namespace ukm {
diff --git a/components/ukm/ukm_recorder_impl.cc b/components/ukm/ukm_recorder_impl.cc
index 08b2296..cf1fadb 100644
--- a/components/ukm/ukm_recorder_impl.cc
+++ b/components/ukm/ukm_recorder_impl.cc
@@ -21,6 +21,7 @@
#include "services/metrics/public/cpp/ukm_decode.h"
#include "services/metrics/public/cpp/ukm_source.h"
#include "services/metrics/public/cpp/ukm_source_id.h"
+#include "services/metrics/public/mojom/ukm_interface.mojom.h"
#include "third_party/metrics_proto/ukm/entry.pb.h"
#include "third_party/metrics_proto/ukm/report.pb.h"
#include "third_party/metrics_proto/ukm/source.pb.h"
diff --git a/components/ukm/ukm_recorder_impl.h b/components/ukm/ukm_recorder_impl.h
index 8a62b52..1dff2e6 100644
--- a/components/ukm/ukm_recorder_impl.h
+++ b/components/ukm/ukm_recorder_impl.h
@@ -18,7 +18,7 @@
#include "base/strings/string_piece.h"
#include "services/metrics/public/cpp/ukm_decode.h"
#include "services/metrics/public/cpp/ukm_recorder.h"
-#include "services/metrics/public/mojom/ukm_interface.mojom.h"
+#include "services/metrics/public/mojom/ukm_interface.mojom-forward.h"
namespace metrics {
class UkmBrowserTestBase;
diff --git a/content/browser/download/mhtml_generation_browsertest.cc b/content/browser/download/mhtml_generation_browsertest.cc
index 5ca7e5e18..2914f58 100644
--- a/content/browser/download/mhtml_generation_browsertest.cc
+++ b/content/browser/download/mhtml_generation_browsertest.cc
@@ -36,6 +36,7 @@
#include "net/test/embedded_test_server/embedded_test_server.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/blink/public/mojom/frame/find_in_page.mojom.h"
#include "third_party/blink/public/web/web_frame_serializer_cache_control_policy.h"
using testing::ContainsRegex;
diff --git a/content/browser/fileapi/file_system_url_loader_factory.cc b/content/browser/fileapi/file_system_url_loader_factory.cc
index 198cd82..115f82f 100644
--- a/content/browser/fileapi/file_system_url_loader_factory.cc
+++ b/content/browser/fileapi/file_system_url_loader_factory.cc
@@ -34,6 +34,7 @@
#include "net/base/mime_util.h"
#include "net/http/http_byte_range.h"
#include "net/http/http_util.h"
+#include "services/network/public/mojom/url_loader.mojom.h"
#include "storage/browser/fileapi/file_stream_reader.h"
#include "storage/browser/fileapi/file_system_context.h"
#include "storage/browser/fileapi/file_system_operation_runner.h"
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index 1ff0eae44..2ae899c 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -179,6 +179,7 @@
#include "third_party/blink/public/common/feature_policy/feature_policy.h"
#include "third_party/blink/public/common/features.h"
#include "third_party/blink/public/common/frame/frame_policy.h"
+#include "third_party/blink/public/mojom/loader/pause_subresource_loading_handle.mojom.h"
#include "third_party/blink/public/mojom/loader/url_loader_factory_bundle.mojom.h"
#include "third_party/blink/public/mojom/service_worker/service_worker_object.mojom.h"
#include "third_party/blink/public/mojom/usb/web_usb_service.mojom.h"
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index ddc66385..63b892510 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -154,6 +154,7 @@
#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
#include "third_party/blink/public/common/frame/sandbox_flags.h"
#include "third_party/blink/public/common/mime_util/mime_util.h"
+#include "third_party/blink/public/mojom/loader/pause_subresource_loading_handle.mojom.h"
#include "third_party/blink/public/platform/web_security_style.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/accessibility/ax_tree_combiner.h"
diff --git a/content/public/browser/browser_context.h b/content/public/browser/browser_context.h
index 6e1403e8..0a6913f 100644
--- a/content/public/browser/browser_context.h
+++ b/content/public/browser/browser_context.h
@@ -20,9 +20,9 @@
#include "content/common/content_export.h"
#include "net/url_request/url_request_interceptor.h"
#include "net/url_request/url_request_job_factory.h"
-#include "services/network/public/mojom/cors_origin_pattern.mojom.h"
-#include "services/service_manager/public/mojom/service.mojom.h"
-#include "third_party/blink/public/mojom/blob/blob.mojom.h"
+#include "services/network/public/mojom/cors_origin_pattern.mojom-forward.h"
+#include "services/service_manager/public/mojom/service.mojom-forward.h"
+#include "third_party/blink/public/mojom/blob/blob.mojom-forward.h"
#if !defined(OS_ANDROID)
#include "content/public/browser/zoom_level_delegate.h"
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
index 5e6bac9..7f1cf2d 100644
--- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc
@@ -34,6 +34,7 @@
#include "services/network/public/mojom/network_service.mojom.h"
#include "services/service_manager/sandbox/sandbox_type.h"
#include "storage/browser/quota/quota_manager.h"
+#include "third_party/blink/public/mojom/renderer_preference_watcher.mojom.h"
#include "ui/gfx/image/image_skia.h"
#include "ui/shell_dialogs/select_file_policy.h"
#include "url/gurl.h"
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index bbfa613..c8d15dbf 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -32,7 +32,7 @@
#include "content/public/common/previews_state.h"
#include "content/public/common/resource_type.h"
#include "content/public/common/socket_permission_request.h"
-#include "content/public/common/window_container_type.mojom.h"
+#include "content/public/common/window_container_type.mojom-forward.h"
#include "media/base/video_codecs.h"
#include "media/cdm/cdm_proxy.h"
#include "media/media_buildflags.h"
@@ -41,18 +41,18 @@
#include "net/cookies/canonical_cookie.h"
#include "net/url_request/url_request_context_getter.h"
#include "services/network/public/mojom/network_context.mojom.h"
-#include "services/network/public/mojom/websocket.mojom.h"
+#include "services/network/public/mojom/websocket.mojom-forward.h"
#include "services/service_manager/public/cpp/binder_registry.h"
#include "services/service_manager/public/cpp/manifest.h"
-#include "services/service_manager/public/mojom/service.mojom.h"
+#include "services/service_manager/public/mojom/service.mojom-forward.h"
#include "services/service_manager/sandbox/sandbox_type.h"
#include "storage/browser/fileapi/file_system_context.h"
#include "storage/browser/quota/quota_manager.h"
#include "third_party/blink/public/common/associated_interfaces/associated_interface_registry.h"
#include "third_party/blink/public/common/mediastream/media_stream_request.h"
-#include "third_party/blink/public/mojom/renderer_preference_watcher.mojom.h"
-#include "third_party/blink/public/platform/web_feature.mojom.h"
-#include "third_party/blink/public/web/window_features.mojom.h"
+#include "third_party/blink/public/mojom/renderer_preference_watcher.mojom-forward.h"
+#include "third_party/blink/public/platform/web_feature.mojom-forward.h"
+#include "third_party/blink/public/web/window_features.mojom-forward.h"
#include "ui/base/page_transition_types.h"
#include "ui/base/window_open_disposition.h"
diff --git a/content/public/browser/download_manager.h b/content/public/browser/download_manager.h
index 677e2b0..5eae562 100644
--- a/content/public/browser/download_manager.h
+++ b/content/public/browser/download_manager.h
@@ -38,7 +38,7 @@
#include "base/time/time.h"
#include "components/download/public/common/download_interrupt_reasons.h"
#include "components/download/public/common/download_item.h"
-#include "components/download/public/common/download_stream.mojom.h"
+#include "components/download/public/common/download_stream.mojom-forward.h"
#include "components/download/public/common/download_url_parameters.h"
#include "components/download/public/common/input_stream.h"
#include "content/common/content_export.h"
diff --git a/content/public/browser/render_frame_host.h b/content/public/browser/render_frame_host.h
index 8c457ba..5cc4b2b 100644
--- a/content/public/browser/render_frame_host.h
+++ b/content/public/browser/render_frame_host.h
@@ -18,9 +18,9 @@
#include "content/public/common/console_message_level.h"
#include "ipc/ipc_listener.h"
#include "ipc/ipc_sender.h"
-#include "services/network/public/mojom/url_loader_factory.mojom.h"
+#include "services/network/public/mojom/url_loader_factory.mojom-forward.h"
#include "third_party/blink/public/common/frame/sandbox_flags.h"
-#include "third_party/blink/public/mojom/loader/pause_subresource_loading_handle.mojom.h"
+#include "third_party/blink/public/mojom/loader/pause_subresource_loading_handle.mojom-forward.h"
#include "third_party/blink/public/platform/web_sudden_termination_disabler_type.h"
#include "ui/accessibility/ax_tree_id.h"
#include "ui/gfx/geometry/rect.h"
diff --git a/content/public/browser/render_process_host.h b/content/public/browser/render_process_host.h
index b87e12e..e82f78a0 100644
--- a/content/public/browser/render_process_host.h
+++ b/content/public/browser/render_process_host.h
@@ -24,10 +24,10 @@
#include "ipc/ipc_channel_proxy.h"
#include "ipc/ipc_sender.h"
#include "media/media_buildflags.h"
-#include "services/network/public/mojom/network_context.mojom.h"
-#include "services/network/public/mojom/url_loader_factory.mojom.h"
-#include "third_party/blink/public/mojom/cache_storage/cache_storage.mojom.h"
-#include "third_party/blink/public/mojom/indexeddb/indexeddb.mojom.h"
+#include "services/network/public/mojom/network_context.mojom-forward.h"
+#include "services/network/public/mojom/url_loader_factory.mojom-forward.h"
+#include "third_party/blink/public/mojom/cache_storage/cache_storage.mojom-forward.h"
+#include "third_party/blink/public/mojom/indexeddb/indexeddb.mojom-forward.h"
#include "ui/gfx/native_widget_types.h"
#if defined(OS_ANDROID)
@@ -46,6 +46,10 @@
class Identity;
}
+namespace url {
+class Origin;
+}
+
namespace content {
class BrowserContext;
class BrowserMessageFilter;
diff --git a/content/public/browser/resource_request_info.h b/content/public/browser/resource_request_info.h
index 7f197a8..1a052fa8 100644
--- a/content/public/browser/resource_request_info.h
+++ b/content/public/browser/resource_request_info.h
@@ -12,7 +12,7 @@
#include "content/public/browser/navigation_ui_data.h"
#include "content/public/common/previews_state.h"
#include "content/public/common/resource_type.h"
-#include "services/network/public/mojom/referrer_policy.mojom.h"
+#include "services/network/public/mojom/referrer_policy.mojom-forward.h"
#include "third_party/blink/public/platform/resource_request_blocked_reason.h"
#include "ui/base/page_transition_types.h"
diff --git a/content/public/browser/serial_chooser.h b/content/public/browser/serial_chooser.h
index 415d0db4..12bfedf 100644
--- a/content/public/browser/serial_chooser.h
+++ b/content/public/browser/serial_chooser.h
@@ -8,7 +8,7 @@
#include "base/callback_forward.h"
#include "base/macros.h"
#include "content/common/content_export.h"
-#include "services/device/public/mojom/serial.mojom.h"
+#include "services/device/public/mojom/serial.mojom-forward.h"
namespace content {
diff --git a/content/public/browser/service_worker_context.h b/content/public/browser/service_worker_context.h
index ee597aa6..a283d43 100644
--- a/content/public/browser/service_worker_context.h
+++ b/content/public/browser/service_worker_context.h
@@ -11,9 +11,15 @@
#include "base/callback_forward.h"
#include "content/common/content_export.h"
-#include "third_party/blink/public/mojom/service_worker/service_worker_registration.mojom.h"
+#include "third_party/blink/public/mojom/service_worker/service_worker_registration.mojom-forward.h"
#include "url/gurl.h"
+namespace blink {
+
+struct TransferableMessage;
+
+}
+
namespace content {
class ServiceWorkerContextObserver;
diff --git a/content/public/browser/storage_partition.h b/content/public/browser/storage_partition.h
index 7fcd854..911c9e3 100644
--- a/content/public/browser/storage_partition.h
+++ b/content/public/browser/storage_partition.h
@@ -15,7 +15,7 @@
#include "base/time/time.h"
#include "content/common/content_export.h"
#include "services/network/public/cpp/shared_url_loader_factory.h"
-#include "services/network/public/mojom/cookie_manager.mojom.h"
+#include "services/network/public/mojom/cookie_manager.mojom-forward.h"
class GURL;
diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
index 22302841..758415f7 100644
--- a/content/public/browser/web_contents.h
+++ b/content/public/browser/web_contents.h
@@ -30,8 +30,8 @@
#include "content/public/browser/web_ui.h"
#include "content/public/common/stop_find_action.h"
#include "third_party/blink/public/common/frame/sandbox_flags.h"
-#include "third_party/blink/public/mojom/frame/find_in_page.mojom.h"
-#include "third_party/blink/public/mojom/loader/pause_subresource_loading_handle.mojom.h"
+#include "third_party/blink/public/mojom/frame/find_in_page.mojom-forward.h"
+#include "third_party/blink/public/mojom/loader/pause_subresource_loading_handle.mojom-forward.h"
#include "third_party/skia/include/core/SkColor.h"
#include "ui/accessibility/ax_mode.h"
#include "ui/accessibility/ax_tree_update.h"
diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h
index b02226b..5a0ec94 100644
--- a/content/public/browser/web_contents_delegate.h
+++ b/content/public/browser/web_contents_delegate.h
@@ -22,10 +22,10 @@
#include "content/public/browser/serial_chooser.h"
#include "content/public/browser/web_contents.h"
#include "content/public/common/previews_state.h"
-#include "content/public/common/window_container_type.mojom.h"
+#include "content/public/common/window_container_type.mojom-forward.h"
#include "third_party/blink/public/common/manifest/web_display_mode.h"
#include "third_party/blink/public/common/mediastream/media_stream_request.h"
-#include "third_party/blink/public/mojom/color_chooser/color_chooser.mojom.h"
+#include "third_party/blink/public/mojom/color_chooser/color_chooser.mojom-forward.h"
#include "third_party/blink/public/platform/web_drag_operation.h"
#include "third_party/blink/public/platform/web_security_style.h"
#include "third_party/blink/public/web/web_fullscreen_options.h"
diff --git a/content/public/browser/web_contents_observer.h b/content/public/browser/web_contents_observer.h
index 0c98222..d35cdd3 100644
--- a/content/public/browser/web_contents_observer.h
+++ b/content/public/browser/web_contents_observer.h
@@ -16,7 +16,7 @@
#include "content/public/browser/reload_type.h"
#include "content/public/browser/visibility.h"
#include "content/public/common/frame_navigate_params.h"
-#include "content/public/common/resource_load_info.mojom.h"
+#include "content/public/common/resource_load_info.mojom-forward.h"
#include "content/public/common/resource_type.h"
#include "ipc/ipc_listener.h"
#include "mojo/public/cpp/system/message_pipe.h"
diff --git a/content/public/common/referrer.h b/content/public/common/referrer.h
index 35d201f..9f099cc 100644
--- a/content/public/common/referrer.h
+++ b/content/public/common/referrer.h
@@ -8,7 +8,7 @@
#include "base/logging.h"
#include "content/common/content_export.h"
#include "net/url_request/url_request.h"
-#include "services/network/public/mojom/referrer_policy.mojom.h"
+#include "services/network/public/mojom/referrer_policy.mojom-shared.h"
#include "url/gurl.h"
namespace content {
diff --git a/content/public/common/service_manager_connection.h b/content/public/common/service_manager_connection.h
index 0e88d902..d430c19 100644
--- a/content/public/common/service_manager_connection.h
+++ b/content/public/common/service_manager_connection.h
@@ -11,7 +11,8 @@
#include "base/sequenced_task_runner.h"
#include "content/common/content_export.h"
#include "services/service_manager/public/cpp/identity.h"
-#include "services/service_manager/public/mojom/service.mojom.h"
+#include "services/service_manager/public/mojom/connector.mojom-forward.h"
+#include "services/service_manager/public/mojom/service.mojom-forward.h"
namespace service_manager {
class Connector;
diff --git a/content/public/common/stop_find_action.h b/content/public/common/stop_find_action.h
index 399c4be6..9ee45a51 100644
--- a/content/public/common/stop_find_action.h
+++ b/content/public/common/stop_find_action.h
@@ -5,7 +5,7 @@
#ifndef CONTENT_PUBLIC_COMMON_STOP_FIND_ACTION_H_
#define CONTENT_PUBLIC_COMMON_STOP_FIND_ACTION_H_
-#include "third_party/blink/public/mojom/frame/find_in_page.mojom.h"
+#include "third_party/blink/public/mojom/frame/find_in_page.mojom-shared.h"
namespace content {
diff --git a/content/public/test/fake_service_worker_context.cc b/content/public/test/fake_service_worker_context.cc
index 5ff19dc..31ca667 100644
--- a/content/public/test/fake_service_worker_context.cc
+++ b/content/public/test/fake_service_worker_context.cc
@@ -7,6 +7,7 @@
#include "base/callback.h"
#include "base/logging.h"
+#include "third_party/blink/public/common/messaging/transferable_message.h"
namespace content {
diff --git a/content/public/test/test_storage_partition.cc b/content/public/test/test_storage_partition.cc
index 1612607..6d3aaf3 100644
--- a/content/public/test/test_storage_partition.cc
+++ b/content/public/test/test_storage_partition.cc
@@ -4,6 +4,8 @@
#include "content/public/test/test_storage_partition.h"
+#include "services/network/public/mojom/cookie_manager.mojom.h"
+
namespace content {
TestStoragePartition::TestStoragePartition() {}
diff --git a/extensions/browser/extension_function.h b/extensions/browser/extension_function.h
index 5be0273..07e1540a 100644
--- a/extensions/browser/extension_function.h
+++ b/extensions/browser/extension_function.h
@@ -27,7 +27,8 @@
#include "extensions/common/extension.h"
#include "extensions/common/features/feature.h"
#include "ipc/ipc_message.h"
-#include "third_party/blink/public/mojom/service_worker/service_worker_registration.mojom.h"
+#include "third_party/blink/public/mojom/service_worker/service_worker_object.mojom-forward.h"
+#include "third_party/blink/public/mojom/service_worker/service_worker_registration.mojom-forward.h"
class ExtensionFunction;
class UIThreadExtensionFunction;
diff --git a/extensions/browser/extensions_browser_client.h b/extensions/browser/extensions_browser_client.h
index 5efbf67..93dce1c 100644
--- a/extensions/browser/extensions_browser_client.h
+++ b/extensions/browser/extensions_browser_client.h
@@ -18,7 +18,7 @@
#include "extensions/browser/extensions_browser_api_provider.h"
#include "extensions/common/extension_id.h"
#include "extensions/common/view_type.h"
-#include "services/network/public/mojom/url_loader.mojom.h"
+#include "services/network/public/mojom/url_loader.mojom-forward.h"
#include "services/service_manager/public/cpp/binder_registry.h"
#include "ui/base/page_transition_types.h"
diff --git a/extensions/browser/extensions_test.cc b/extensions/browser/extensions_test.cc
index 9961a2a..affa921 100644
--- a/extensions/browser/extensions_test.cc
+++ b/extensions/browser/extensions_test.cc
@@ -15,6 +15,7 @@
#include "extensions/browser/extension_prefs_factory.h"
#include "extensions/browser/test_extensions_browser_client.h"
#include "extensions/test/test_content_utility_client.h"
+#include "services/network/public/mojom/cors_origin_pattern.mojom.h"
namespace {
diff --git a/extensions/browser/test_extensions_browser_client.cc b/extensions/browser/test_extensions_browser_client.cc
index e4faba3..5a5a9c2 100644
--- a/extensions/browser/test_extensions_browser_client.cc
+++ b/extensions/browser/test_extensions_browser_client.cc
@@ -11,6 +11,7 @@
#include "extensions/browser/extension_host_delegate.h"
#include "extensions/browser/test_runtime_api_delegate.h"
#include "extensions/browser/updater/null_extension_cache.h"
+#include "services/network/public/mojom/url_loader.mojom.h"
#include "ui/base/l10n/l10n_util.h"
#if defined(OS_CHROMEOS)
diff --git a/extensions/common/DEPS b/extensions/common/DEPS
index e96544a6..54cb34fc 100644
--- a/extensions/common/DEPS
+++ b/extensions/common/DEPS
@@ -7,6 +7,7 @@
"+grit/extensions_strings.h",
"+libxml",
"+net",
+ "+services/network/public/mojom/cors_origin_pattern.mojom-forward.h",
"+services/network/public/mojom/cors_origin_pattern.mojom.h",
"+third_party/libxml",
"+third_party/re2",
diff --git a/extensions/common/extensions_client.h b/extensions/common/extensions_client.h
index 6c6e729..9491fb6 100644
--- a/extensions/common/extensions_client.h
+++ b/extensions/common/extensions_client.h
@@ -12,7 +12,7 @@
#include "base/strings/string_piece.h"
#include "extensions/common/permissions/api_permission_set.h"
-#include "services/network/public/mojom/cors_origin_pattern.mojom.h"
+#include "services/network/public/mojom/cors_origin_pattern.mojom-forward.h"
class GURL;
diff --git a/extensions/shell/browser/DEPS b/extensions/shell/browser/DEPS
index 7086c3f..e823d16 100644
--- a/extensions/shell/browser/DEPS
+++ b/extensions/shell/browser/DEPS
@@ -32,6 +32,7 @@
"+ppapi",
"+services/network/session_cleanup_cookie_store.h",
+ "+services/network/public/mojom/url_loader.mojom.h",
"+storage/browser/quota",
"+third_party/skia/include",
diff --git a/extensions/shell/browser/shell_extensions_browser_client.cc b/extensions/shell/browser/shell_extensions_browser_client.cc
index 0a3ec54..2b1541c 100644
--- a/extensions/shell/browser/shell_extensions_browser_client.cc
+++ b/extensions/shell/browser/shell_extensions_browser_client.cc
@@ -34,6 +34,7 @@
#include "extensions/shell/browser/shell_extensions_api_client.h"
#include "extensions/shell/browser/shell_extensions_browser_api_provider.h"
#include "extensions/shell/browser/shell_navigation_ui_data.h"
+#include "services/network/public/mojom/url_loader.mojom.h"
#if defined(OS_CHROMEOS)
#include "chromeos/login/login_state/login_state.h"
diff --git a/ipc/ipc_channel.h b/ipc/ipc_channel.h
index 91b184ce..b1eacf3 100644
--- a/ipc/ipc_channel.h
+++ b/ipc/ipc_channel.h
@@ -20,7 +20,7 @@
#include "base/single_thread_task_runner.h"
#include "base/threading/thread_task_runner_handle.h"
#include "build/build_config.h"
-#include "ipc/ipc.mojom.h"
+#include "ipc/ipc.mojom-forward.h"
#include "ipc/ipc_channel_handle.h"
#include "ipc/ipc_message.h"
#include "ipc/ipc_sender.h"
diff --git a/ipc/ipc_channel_proxy.h b/ipc/ipc_channel_proxy.h
index b600e5d..cbffc5500 100644
--- a/ipc/ipc_channel_proxy.h
+++ b/ipc/ipc_channel_proxy.h
@@ -19,6 +19,7 @@
#include "base/sequence_checker.h"
#include "base/synchronization/lock.h"
#include "build/build_config.h"
+#include "ipc/ipc.mojom.h"
#include "ipc/ipc_channel.h"
#include "ipc/ipc_channel_handle.h"
#include "ipc/ipc_listener.h"
diff --git a/ipc/message_view.cc b/ipc/message_view.cc
index d6ff4fb..233b83e7 100644
--- a/ipc/message_view.cc
+++ b/ipc/message_view.cc
@@ -4,6 +4,8 @@
#include "ipc/message_view.h"
+#include "mojo/public/interfaces/bindings/native_struct.mojom.h"
+
namespace IPC {
MessageView::MessageView() = default;
diff --git a/ipc/message_view.h b/ipc/message_view.h
index 23e5da6..85879f7 100644
--- a/ipc/message_view.h
+++ b/ipc/message_view.h
@@ -12,7 +12,7 @@
#include "base/macros.h"
#include "ipc/ipc_message.h"
#include "mojo/public/cpp/base/big_buffer.h"
-#include "mojo/public/interfaces/bindings/native_struct.mojom.h"
+#include "mojo/public/interfaces/bindings/native_struct.mojom-forward.h"
namespace IPC {
diff --git a/services/metrics/public/cpp/ukm_recorder.h b/services/metrics/public/cpp/ukm_recorder.h
index f83ae77..c547e09 100644
--- a/services/metrics/public/cpp/ukm_recorder.h
+++ b/services/metrics/public/cpp/ukm_recorder.h
@@ -14,7 +14,7 @@
#include "services/metrics/public/cpp/metrics_export.h"
#include "services/metrics/public/cpp/ukm_source.h"
#include "services/metrics/public/cpp/ukm_source_id.h"
-#include "services/metrics/public/mojom/ukm_interface.mojom.h"
+#include "services/metrics/public/mojom/ukm_interface.mojom-forward.h"
#include "url/gurl.h"
class BackgroundFetchDelegateImpl;
diff --git a/services/network/public/cpp/data_element.cc b/services/network/public/cpp/data_element.cc
index f516f82..c7e391ef 100644
--- a/services/network/public/cpp/data_element.cc
+++ b/services/network/public/cpp/data_element.cc
@@ -10,6 +10,8 @@
#include <algorithm>
#include "base/strings/string_number_conversions.h"
+#include "services/network/public/mojom/chunked_data_pipe_getter.mojom.h"
+#include "services/network/public/mojom/data_pipe_getter.mojom.h"
namespace network {
diff --git a/services/network/public/cpp/data_element.h b/services/network/public/cpp/data_element.h
index 01e26f0..28de27d 100644
--- a/services/network/public/cpp/data_element.h
+++ b/services/network/public/cpp/data_element.h
@@ -22,8 +22,8 @@
#include "base/time/time.h"
#include "mojo/public/cpp/bindings/enum_traits.h"
#include "mojo/public/cpp/system/data_pipe.h"
-#include "services/network/public/mojom/chunked_data_pipe_getter.mojom.h"
-#include "services/network/public/mojom/data_pipe_getter.mojom.h"
+#include "services/network/public/mojom/chunked_data_pipe_getter.mojom-forward.h"
+#include "services/network/public/mojom/data_pipe_getter.mojom-forward.h"
#include "services/network/public/mojom/url_loader.mojom-shared.h"
#include "url/gurl.h"
diff --git a/services/network/public/cpp/network_ipc_param_traits.cc b/services/network/public/cpp/network_ipc_param_traits.cc
index eb204aa..9e5feba 100644
--- a/services/network/public/cpp/network_ipc_param_traits.cc
+++ b/services/network/public/cpp/network_ipc_param_traits.cc
@@ -9,6 +9,8 @@
#include "ipc/ipc_platform_file.h"
#include "net/http/http_util.h"
#include "services/network/public/cpp/http_raw_request_response_info.h"
+#include "services/network/public/mojom/chunked_data_pipe_getter.mojom.h"
+#include "services/network/public/mojom/data_pipe_getter.mojom.h"
#include "services/network/public/mojom/url_loader.mojom-shared.h"
namespace IPC {
diff --git a/services/network/public/cpp/network_quality_tracker.cc b/services/network/public/cpp/network_quality_tracker.cc
index c3dd92d6..a7a36bd 100644
--- a/services/network/public/cpp/network_quality_tracker.cc
+++ b/services/network/public/cpp/network_quality_tracker.cc
@@ -9,6 +9,7 @@
#include "base/bind.h"
#include "base/logging.h"
+#include "services/network/public/mojom/network_service.mojom.h"
namespace network {
diff --git a/services/network/public/cpp/network_quality_tracker.h b/services/network/public/cpp/network_quality_tracker.h
index 092064c7..f5834f81 100644
--- a/services/network/public/cpp/network_quality_tracker.h
+++ b/services/network/public/cpp/network_quality_tracker.h
@@ -16,7 +16,7 @@
#include "mojo/public/cpp/bindings/binding_set.h"
#include "net/nqe/effective_connection_type.h"
#include "services/network/public/mojom/network_quality_estimator_manager.mojom.h"
-#include "services/network/public/mojom/network_service.mojom.h"
+#include "services/network/public/mojom/network_service.mojom-forward.h"
namespace network {
diff --git a/services/network/public/cpp/resource_request_body.cc b/services/network/public/cpp/resource_request_body.cc
index 923d365..2c7cec65 100644
--- a/services/network/public/cpp/resource_request_body.cc
+++ b/services/network/public/cpp/resource_request_body.cc
@@ -4,6 +4,9 @@
#include "services/network/public/cpp/resource_request_body.h"
+#include "services/network/public/mojom/chunked_data_pipe_getter.mojom.h"
+#include "services/network/public/mojom/data_pipe_getter.mojom.h"
+
namespace network {
ResourceRequestBody::ResourceRequestBody()
diff --git a/services/network/public/cpp/url_request_mojom_traits.cc b/services/network/public/cpp/url_request_mojom_traits.cc
index 10d84e5f..f67fb04 100644
--- a/services/network/public/cpp/url_request_mojom_traits.cc
+++ b/services/network/public/cpp/url_request_mojom_traits.cc
@@ -14,6 +14,7 @@
#include "services/network/public/cpp/http_request_headers_mojom_traits.h"
#include "services/network/public/cpp/network_ipc_param_traits.h"
#include "services/network/public/cpp/resource_request_body.h"
+#include "services/network/public/mojom/chunked_data_pipe_getter.mojom.h"
#include "services/network/public/mojom/url_loader.mojom-shared.h"
#include "url/mojom/origin_mojom_traits.h"
#include "url/mojom/url_gurl_mojom_traits.h"
diff --git a/services/network/public/cpp/url_request_mojom_traits.h b/services/network/public/cpp/url_request_mojom_traits.h
index 551ecff..20dd802 100644
--- a/services/network/public/cpp/url_request_mojom_traits.h
+++ b/services/network/public/cpp/url_request_mojom_traits.h
@@ -20,7 +20,7 @@
#include "services/network/public/cpp/resource_request.h"
#include "services/network/public/cpp/resource_request_body.h"
#include "services/network/public/mojom/chunked_data_pipe_getter.mojom-shared.h"
-#include "services/network/public/mojom/data_pipe_getter.mojom-shared.h"
+#include "services/network/public/mojom/data_pipe_getter.mojom.h"
#include "services/network/public/mojom/url_loader.mojom-shared.h"
namespace mojo {
diff --git a/services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h b/services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h
index 0c1de56..57089a6 100644
--- a/services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h
+++ b/services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h
@@ -8,7 +8,7 @@
#include "base/callback.h"
#include "base/component_export.h"
#include "services/network/public/cpp/shared_url_loader_factory.h"
-#include "services/network/public/mojom/url_loader_factory.mojom.h"
+#include "services/network/public/mojom/url_loader_factory.mojom-forward.h"
namespace network {
diff --git a/services/preferences/public/cpp/in_process_service_factory.h b/services/preferences/public/cpp/in_process_service_factory.h
index bb4bbf4b..73fc330 100644
--- a/services/preferences/public/cpp/in_process_service_factory.h
+++ b/services/preferences/public/cpp/in_process_service_factory.h
@@ -14,7 +14,7 @@
#include "components/keyed_service/core/keyed_service.h"
#include "components/prefs/pref_value_store.h"
#include "services/service_manager/public/cpp/service.h"
-#include "services/service_manager/public/mojom/service.mojom.h"
+#include "services/service_manager/public/mojom/service.mojom-forward.h"
class PersistentPrefStore;
class PrefRegistry;
diff --git a/services/service_manager/public/cpp/connector.cc b/services/service_manager/public/cpp/connector.cc
index 5dbeaca..89ce2f0 100644
--- a/services/service_manager/public/cpp/connector.cc
+++ b/services/service_manager/public/cpp/connector.cc
@@ -6,6 +6,7 @@
#include "base/bind.h"
#include "services/service_manager/public/cpp/identity.h"
+#include "services/service_manager/public/mojom/service.mojom.h"
namespace service_manager {
diff --git a/services/service_manager/public/cpp/connector.h b/services/service_manager/public/cpp/connector.h
index 66da043..741a9ec 100644
--- a/services/service_manager/public/cpp/connector.h
+++ b/services/service_manager/public/cpp/connector.h
@@ -14,8 +14,8 @@
#include "services/service_manager/public/cpp/export.h"
#include "services/service_manager/public/cpp/identity.h"
#include "services/service_manager/public/mojom/connector.mojom.h"
-#include "services/service_manager/public/mojom/service.mojom.h"
-#include "services/service_manager/public/mojom/service_manager.mojom.h"
+#include "services/service_manager/public/mojom/service.mojom-forward.h"
+#include "services/service_manager/public/mojom/service_manager.mojom-forward.h"
namespace service_manager {
diff --git a/services/service_manager/public/cpp/test/test_connector_factory.cc b/services/service_manager/public/cpp/test/test_connector_factory.cc
index 5eb34a8..72fe2112 100644
--- a/services/service_manager/public/cpp/test/test_connector_factory.cc
+++ b/services/service_manager/public/cpp/test/test_connector_factory.cc
@@ -14,6 +14,7 @@
#include "mojo/public/cpp/bindings/binding_set.h"
#include "services/service_manager/public/cpp/service.h"
#include "services/service_manager/public/mojom/connector.mojom.h"
+#include "services/service_manager/public/mojom/service.mojom.h"
namespace service_manager {
diff --git a/services/service_manager/tests/util.cc b/services/service_manager/tests/util.cc
index 5b5a4509..03380bd7 100644
--- a/services/service_manager/tests/util.cc
+++ b/services/service_manager/tests/util.cc
@@ -21,6 +21,7 @@
#include "mojo/public/cpp/system/invitation.h"
#include "services/service_manager/public/cpp/connector.h"
#include "services/service_manager/public/mojom/connector.mojom.h"
+#include "services/service_manager/public/mojom/service.mojom.h"
#include "services/service_manager/public/mojom/service_factory.mojom.h"
#include "services/service_manager/runner/common/switches.h"
diff --git a/storage/browser/quota/quota_callbacks.h b/storage/browser/quota/quota_callbacks.h
index 1d4025f..995ceb755 100644
--- a/storage/browser/quota/quota_callbacks.h
+++ b/storage/browser/quota/quota_callbacks.h
@@ -17,7 +17,7 @@
#include "base/optional.h"
#include "base/stl_util.h"
#include "storage/browser/quota/quota_client.h"
-#include "third_party/blink/public/mojom/quota/quota_types.mojom.h"
+#include "third_party/blink/public/mojom/quota/quota_types.mojom-forward.h"
namespace url {
class Origin;
diff --git a/storage/browser/quota/quota_client.h b/storage/browser/quota/quota_client.h
index 868d68e..34e7bb4 100644
--- a/storage/browser/quota/quota_client.h
+++ b/storage/browser/quota/quota_client.h
@@ -12,7 +12,7 @@
#include "base/callback.h"
#include "base/component_export.h"
-#include "third_party/blink/public/mojom/quota/quota_types.mojom.h"
+#include "third_party/blink/public/mojom/quota/quota_types.mojom-forward.h"
#include "url/origin.h"
namespace storage {
diff --git a/storage/browser/quota/quota_database.cc b/storage/browser/quota/quota_database.cc
index 012cc11..eb1539d 100644
--- a/storage/browser/quota/quota_database.cc
+++ b/storage/browser/quota/quota_database.cc
@@ -20,6 +20,7 @@
#include "sql/statement.h"
#include "sql/transaction.h"
#include "storage/browser/quota/special_storage_policy.h"
+#include "third_party/blink/public/mojom/quota/quota_types.mojom-shared.h"
#include "url/gurl.h"
using blink::mojom::StorageType;
diff --git a/storage/browser/quota/quota_database.h b/storage/browser/quota/quota_database.h
index eb080d3..132f1ae 100644
--- a/storage/browser/quota/quota_database.h
+++ b/storage/browser/quota/quota_database.h
@@ -18,7 +18,7 @@
#include "base/macros.h"
#include "base/time/time.h"
#include "base/timer/timer.h"
-#include "third_party/blink/public/mojom/quota/quota_types.mojom.h"
+#include "third_party/blink/public/mojom/quota/quota_types.mojom-forward.h"
#include "url/origin.h"
namespace content {
diff --git a/storage/browser/quota/quota_database_unittest.cc b/storage/browser/quota/quota_database_unittest.cc
index b6f9532..288049b 100644
--- a/storage/browser/quota/quota_database_unittest.cc
+++ b/storage/browser/quota/quota_database_unittest.cc
@@ -23,6 +23,7 @@
#include "storage/browser/quota/quota_database.h"
#include "storage/browser/test/mock_special_storage_policy.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/blink/public/mojom/quota/quota_types.mojom-shared.h"
#include "url/gurl.h"
using storage::QuotaDatabase;
diff --git a/storage/browser/quota/quota_manager.h b/storage/browser/quota/quota_manager.h
index 5fb9468e..8393f2f 100644
--- a/storage/browser/quota/quota_manager.h
+++ b/storage/browser/quota/quota_manager.h
@@ -32,7 +32,7 @@
#include "storage/browser/quota/quota_task.h"
#include "storage/browser/quota/special_storage_policy.h"
#include "storage/browser/quota/storage_observer.h"
-#include "third_party/blink/public/mojom/quota/quota_types.mojom.h"
+#include "third_party/blink/public/mojom/quota/quota_types.mojom-forward.h"
namespace base {
class SequencedTaskRunner;
diff --git a/storage/browser/quota/storage_observer.cc b/storage/browser/quota/storage_observer.cc
index 37aece7..b7ab0b1b 100644
--- a/storage/browser/quota/storage_observer.cc
+++ b/storage/browser/quota/storage_observer.cc
@@ -2,9 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "storage/browser/quota/storage_observer.h"
+
#include <stdint.h>
-#include "storage/browser/quota/storage_observer.h"
+#include "third_party/blink/public/mojom/quota/quota_types.mojom-shared.h"
namespace storage {
diff --git a/storage/browser/quota/storage_observer.h b/storage/browser/quota/storage_observer.h
index 942ca9ef..e38c19a 100644
--- a/storage/browser/quota/storage_observer.h
+++ b/storage/browser/quota/storage_observer.h
@@ -10,7 +10,7 @@
#include "base/component_export.h"
#include "base/time/time.h"
#include "storage/browser/quota/quota_client.h"
-#include "third_party/blink/public/mojom/quota/quota_types.mojom.h"
+#include "third_party/blink/public/mojom/quota/quota_types.mojom-forward.h"
#include "url/origin.h"
namespace storage {
diff --git a/third_party/blink/common/messaging/transferable_message.cc b/third_party/blink/common/messaging/transferable_message.cc
index 3388e5e8..4a69d0aa 100644
--- a/third_party/blink/common/messaging/transferable_message.cc
+++ b/third_party/blink/common/messaging/transferable_message.cc
@@ -4,6 +4,8 @@
#include "third_party/blink/public/common/messaging/transferable_message.h"
+#include "third_party/blink/public/mojom/array_buffer/array_buffer_contents.mojom.h"
+
namespace blink {
TransferableMessage::TransferableMessage() = default;
diff --git a/third_party/blink/public/common/messaging/transferable_message.h b/third_party/blink/public/common/messaging/transferable_message.h
index e58a41ae..5b68cc6 100644
--- a/third_party/blink/public/common/messaging/transferable_message.h
+++ b/third_party/blink/public/common/messaging/transferable_message.h
@@ -12,7 +12,7 @@
#include "third_party/blink/public/common/common_export.h"
#include "third_party/blink/public/common/messaging/cloneable_message.h"
#include "third_party/blink/public/common/messaging/message_port_channel.h"
-#include "third_party/blink/public/mojom/array_buffer/array_buffer_contents.mojom.h"
+#include "third_party/blink/public/mojom/array_buffer/array_buffer_contents.mojom-forward.h"
#include "third_party/blink/public/mojom/messaging/user_activation_snapshot.mojom.h"
#include "third_party/skia/include/core/SkBitmap.h"
diff --git a/ui/accessibility/ax_node_data.h b/ui/accessibility/ax_node_data.h
index 9762ed1b..3a26596 100644
--- a/ui/accessibility/ax_node_data.h
+++ b/ui/accessibility/ax_node_data.h
@@ -14,7 +14,7 @@
#include "base/strings/string16.h"
#include "base/strings/string_split.h"
-#include "ui/accessibility/ax_enums.mojom.h"
+#include "ui/accessibility/ax_enums.mojom-shared.h"
#include "ui/accessibility/ax_export.h"
#include "ui/accessibility/ax_relative_bounds.h"
#include "ui/gfx/geometry/rect_f.h"
diff --git a/ui/accessibility/ax_relative_bounds.h b/ui/accessibility/ax_relative_bounds.h
index 5126f74..4f15611 100644
--- a/ui/accessibility/ax_relative_bounds.h
+++ b/ui/accessibility/ax_relative_bounds.h
@@ -10,7 +10,7 @@
#include <memory>
#include <ostream>
-#include "ui/accessibility/ax_enums.mojom.h"
+#include "ui/accessibility/ax_enums.mojom-forward.h"
#include "ui/accessibility/ax_export.h"
#include "ui/gfx/geometry/rect_f.h"
#include "ui/gfx/transform.h"
diff --git a/ui/accessibility/ax_tree_data.h b/ui/accessibility/ax_tree_data.h
index dec27f4..2470f4e 100644
--- a/ui/accessibility/ax_tree_data.h
+++ b/ui/accessibility/ax_tree_data.h
@@ -13,7 +13,7 @@
#include "base/strings/string16.h"
#include "base/strings/string_split.h"
-#include "ui/accessibility/ax_enums.mojom.h"
+#include "ui/accessibility/ax_enums.mojom-forward.h"
#include "ui/accessibility/ax_export.h"
#include "ui/accessibility/ax_tree_id_registry.h"
#include "ui/gfx/geometry/rect.h"
diff --git a/ui/accessibility/ax_tree_id.h b/ui/accessibility/ax_tree_id.h
index 47490b3..3fd82a77 100644
--- a/ui/accessibility/ax_tree_id.h
+++ b/ui/accessibility/ax_tree_id.h
@@ -8,7 +8,7 @@
#include <string>
#include "base/unguessable_token.h"
-#include "ui/accessibility/ax_enums.mojom.h"
+#include "ui/accessibility/ax_enums.mojom-shared.h"
#include "ui/accessibility/ax_export.h"
namespace mojo {
