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/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"
