Revert "OnionSoup: Move mojom files from public/platform/web to public/mojom folder"

This reverts commit e656908dbda6ced2f4743a9b5c2ed926dc6b5b67.

Reason for revert: Appears to cause build failure on Android

[71296/78273] ACTION //content/public/android:content_java__process_prebuilt__bytecode_rewrite(//build/toolchain/android:android_clang_arm)
FAILED: obj/content/public/android/content_java__process_prebuilt-bytecode-rewritten.jar
python ../../build/android/gyp/bytecode_processor.py --script bin/helper/java_bytecode_rewriter [...removed for brevity, see link...]
Missing 2 classes missing in direct classpath. To fix, add GN deps for:
gen/third_party/blink/public/mojom/android_mojo_bindings_java.javac.jar
Traceback (most recent call last):
File "../../build/android/gyp/bytecode_processor.py", line 76, in <module>
sys.exit(main(sys.argv))
File "../../build/android/gyp/bytecode_processor.py", line 72, in main
subprocess.check_call(cmd)
File "/b/swarming/w/ir/cipd_bin_packages/lib/python2.7/subprocess.py", line 186, in check_call
raise CalledProcessError(retcode, cmd)

(https://ci.chromium.org/p/chromium/builders/ci/android-rel/9664)

Original change's description:
> OnionSoup: Move mojom files from public/platform/web to public/mojom folder
> 
> This CL moves window_features.mojom, commit_result.mojom,
> devtools_frontend.mojom, selection_menu_behavior.mojom and
> remote_objects.mojom from public/platform/web to public/mojom/
> to gather mojom files to mojom folder and updates paths for these
> mojom files.
> 
> Bug: 919393
> Change-Id: If6df031ed39d70e700986bd13a40d0598257e009
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1514434
> Reviewed-by: Scott Violet <sky@chromium.org>
> Reviewed-by: Kentaro Hara <haraken@chromium.org>
> Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
> Reviewed-by: Dmitry Gozman <dgozman@chromium.org>
> Commit-Queue: Julie Jeongeun Kim <jkim@igalia.com>
> Cr-Commit-Position: refs/heads/master@{#640633}

TBR=dgozman@chromium.org,sky@chromium.org,kinuko@chromium.org,haraken@chromium.org,jkim@igalia.com

Change-Id: I5744072dbaeffba5706f329838e37d74c065ae27
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 919393
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1523386
Reviewed-by: Fredrik Söderquist <fs@opera.com>
Commit-Queue: Fredrik Söderquist <fs@opera.com>
Cr-Commit-Position: refs/heads/master@{#640688}
diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS
index e641300..dffba63f 100644
--- a/chrome/browser/DEPS
+++ b/chrome/browser/DEPS
@@ -199,6 +199,7 @@
   "+third_party/blink/public/platform/modules/installedapp/installed_app_provider.mojom.h",
   "+third_party/blink/public/platform/modules/presentation/presentation.mojom.h",
   "+third_party/blink/public/platform/modules/webauthn/authenticator.mojom.h",
+  "+third_party/blink/public/web/window_features.mojom.h",
 
   # The following restrictions are for ChromeOS and in particular mus/mash where
   # Ozone does not run in process. If the linux build transitions to Ozone then
diff --git a/chrome/browser/ui/blocked_content/blocked_window_params.h b/chrome/browser/ui/blocked_content/blocked_window_params.h
index 00917fb..26857e6 100644
--- a/chrome/browser/ui/blocked_content/blocked_window_params.h
+++ b/chrome/browser/ui/blocked_content/blocked_window_params.h
@@ -7,7 +7,7 @@
 
 #include "chrome/browser/ui/browser_navigator_params.h"
 #include "content/public/common/referrer.h"
-#include "third_party/blink/public/mojom/window_features/window_features.mojom.h"
+#include "third_party/blink/public/web/window_features.mojom.h"
 #include "ui/base/window_open_disposition.h"
 #include "url/gurl.h"
 #include "url/origin.h"
diff --git a/chrome/browser/ui/blocked_content/popup_blocker.h b/chrome/browser/ui/blocked_content/popup_blocker.h
index 1cb99b9..8298d95 100644
--- a/chrome/browser/ui/blocked_content/popup_blocker.h
+++ b/chrome/browser/ui/blocked_content/popup_blocker.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_UI_BLOCKED_CONTENT_POPUP_BLOCKER_H_
 
 #include "base/optional.h"
-#include "third_party/blink/public/mojom/window_features/window_features.mojom.h"
+#include "third_party/blink/public/web/window_features.mojom.h"
 #include "ui/base/window_open_disposition.h"
 #include "url/gurl.h"
 
diff --git a/chrome/common/chrome_render_frame.mojom b/chrome/common/chrome_render_frame.mojom
index a352543..8a57c12a 100644
--- a/chrome/common/chrome_render_frame.mojom
+++ b/chrome/common/chrome_render_frame.mojom
@@ -5,7 +5,7 @@
 module chrome.mojom;
 
 import "mojo/public/mojom/base/string16.mojom";
-import "third_party/blink/public/mojom/window_features/window_features.mojom";
+import "third_party/blink/public/web/window_features.mojom";
 import "ui/gfx/geometry/mojo/geometry.mojom";
 
 enum ImageFormat {
diff --git a/content/browser/DEPS b/content/browser/DEPS
index abe8bc3..f05cdb3 100644
--- a/content/browser/DEPS
+++ b/content/browser/DEPS
@@ -141,6 +141,8 @@
   "+third_party/blink/public/platform/modules/webauthn/virtual_authenticator.mojom.h",
   "+third_party/blink/public/platform/modules/webdatabase/web_database.mojom.h",
   "+third_party/blink/public/platform/modules/websockets/websocket.mojom.h",
+  "+third_party/blink/public/web/commit_result.mojom.h",
+  "+third_party/blink/public/web/devtools_frontend.mojom.h",
 
   # DO NOT ADD ANY CHROME OR COMPONENTS INCLUDES HERE!!!
   # See https://sites.google.com/a/chromium.org/dev/developers/content-module
diff --git a/content/browser/devtools/devtools_frontend_host_impl.h b/content/browser/devtools/devtools_frontend_host_impl.h
index 8b53bcd..43f03d2 100644
--- a/content/browser/devtools/devtools_frontend_host_impl.h
+++ b/content/browser/devtools/devtools_frontend_host_impl.h
@@ -8,7 +8,7 @@
 #include "base/macros.h"
 #include "content/public/browser/devtools_frontend_host.h"
 #include "mojo/public/cpp/bindings/associated_binding.h"
-#include "third_party/blink/public/mojom/devtools/devtools_frontend.mojom.h"
+#include "third_party/blink/public/web/devtools_frontend.mojom.h"
 
 namespace content {
 
diff --git a/content/browser/frame_host/render_frame_host_impl.h b/content/browser/frame_host/render_frame_host_impl.h
index fb69d56..e91feba 100644
--- a/content/browser/frame_host/render_frame_host_impl.h
+++ b/content/browser/frame_host/render_frame_host_impl.h
@@ -65,7 +65,6 @@
 #include "third_party/blink/public/common/frame/frame_owner_element_type.h"
 #include "third_party/blink/public/common/frame/user_activation_update_type.h"
 #include "third_party/blink/public/mojom/choosers/file_chooser.mojom.h"
-#include "third_party/blink/public/mojom/commit_result/commit_result.mojom.h"
 #include "third_party/blink/public/mojom/devtools/devtools_agent.mojom.h"
 #include "third_party/blink/public/mojom/frame/document_interface_broker.mojom.h"
 #include "third_party/blink/public/mojom/frame/find_in_page.mojom.h"
@@ -80,6 +79,7 @@
 #include "third_party/blink/public/platform/web_insecure_request_policy.h"
 #include "third_party/blink/public/platform/web_scroll_types.h"
 #include "third_party/blink/public/platform/web_sudden_termination_disabler_type.h"
+#include "third_party/blink/public/web/commit_result.mojom.h"
 #include "third_party/blink/public/web/web_text_direction.h"
 #include "third_party/blink/public/web/web_tree_scope_type.h"
 #include "ui/accessibility/ax_action_handler.h"
diff --git a/content/common/frame.mojom b/content/common/frame.mojom
index 8406b09..e278eaf 100644
--- a/content/common/frame.mojom
+++ b/content/common/frame.mojom
@@ -20,7 +20,6 @@
 import "services/service_manager/public/mojom/interface_provider.mojom";
 import "services/viz/public/interfaces/compositing/surface_id.mojom";
 import "third_party/blink/public/mojom/blob/blob_url_store.mojom";
-import "third_party/blink/public/mojom/commit_result/commit_result.mojom";
 import "third_party/blink/public/mojom/feature_policy/feature_policy.mojom";
 import "third_party/blink/public/mojom/frame/lifecycle.mojom";
 import "third_party/blink/public/mojom/frame/navigation_initiator.mojom";
@@ -31,9 +30,10 @@
 import "third_party/blink/public/mojom/referrer.mojom";
 import "third_party/blink/public/mojom/service_worker/controller_service_worker.mojom";
 import "third_party/blink/public/mojom/service_worker/service_worker_provider.mojom";
+import "third_party/blink/public/web/commit_result.mojom";
 import "third_party/blink/public/mojom/devtools/devtools_agent.mojom";
 import "third_party/blink/public/mojom/portal/portal.mojom";
-import "third_party/blink/public/mojom/window_features/window_features.mojom";
+import "third_party/blink/public/web/window_features.mojom";
 import "ui/base/mojo/window_open_disposition.mojom";
 import "url/mojom/url.mojom";
 import "ui/gfx/geometry/mojo/geometry.mojom";
diff --git a/content/common/input/input_handler.mojom b/content/common/input/input_handler.mojom
index 749a04b1..4978308 100644
--- a/content/common/input/input_handler.mojom
+++ b/content/common/input/input_handler.mojom
@@ -9,7 +9,7 @@
 import "mojo/public/mojom/base/string16.mojom";
 import "mojo/public/mojom/base/time.mojom";
 import "services/ws/public/mojom/ime/ime.mojom";
-import "third_party/blink/public/mojom/selection_menu/selection_menu_behavior.mojom";
+import "third_party/blink/public/web/selection_menu_behavior.mojom";
 import "ui/events/mojo/event.mojom";
 import "ui/events/mojo/event_constants.mojom";
 import "ui/gfx/geometry/mojo/geometry.mojom";
diff --git a/content/common/navigation_client.mojom b/content/common/navigation_client.mojom
index ece3b60..0641972 100644
--- a/content/common/navigation_client.mojom
+++ b/content/common/navigation_client.mojom
@@ -13,7 +13,7 @@
 import "third_party/blink/public/mojom/loader/url_loader_factory_bundle.mojom";
 import "third_party/blink/public/mojom/service_worker/controller_service_worker.mojom";
 import "third_party/blink/public/mojom/service_worker/service_worker_provider.mojom";
-import "third_party/blink/public/mojom/commit_result/commit_result.mojom";
+import "third_party/blink/public/web/commit_result.mojom";
 
 // See src/content/common/navigation_params.h
 [Native]
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 5dba81a..bf74558 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -55,7 +55,7 @@
 #include "third_party/blink/public/common/user_agent/user_agent_metadata.h"
 #include "third_party/blink/public/mojom/renderer_preference_watcher.mojom-forward.h"
 #include "third_party/blink/public/mojom/web_feature/web_feature.mojom-forward.h"
-#include "third_party/blink/public/mojom/window_features/window_features.mojom-forward.h"
+#include "third_party/blink/public/web/window_features.mojom-forward.h"
 #include "ui/accessibility/ax_mode.h"
 #include "ui/base/page_transition_types.h"
 #include "ui/base/window_open_disposition.h"
diff --git a/content/public/common/common_param_traits_macros.h b/content/public/common/common_param_traits_macros.h
index ed9dafc..2b23b28 100644
--- a/content/public/common/common_param_traits_macros.h
+++ b/content/public/common/common_param_traits_macros.h
@@ -20,13 +20,13 @@
 #include "third_party/blink/public/mojom/devtools/console_message.mojom.h"
 #include "third_party/blink/public/mojom/permissions/permission_status.mojom.h"
 #include "third_party/blink/public/mojom/renderer_preferences.mojom.h"
-#include "third_party/blink/public/mojom/window_features/window_features.mojom.h"
 #include "third_party/blink/public/platform/web_drag_operation.h"
 #include "third_party/blink/public/platform/web_history_scroll_restoration_type.h"
 #include "third_party/blink/public/platform/web_point.h"
 #include "third_party/blink/public/platform/web_rect.h"
 #include "third_party/blink/public/platform/web_security_style.h"
 #include "third_party/blink/public/platform/web_url_request.h"
+#include "third_party/blink/public/web/window_features.mojom.h"
 #include "ui/accessibility/ax_event.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/accessibility/ax_relative_bounds.h"
diff --git a/content/public/renderer/window_features_converter.h b/content/public/renderer/window_features_converter.h
index aafc913..dbc78a7 100644
--- a/content/public/renderer/window_features_converter.h
+++ b/content/public/renderer/window_features_converter.h
@@ -6,8 +6,8 @@
 #define CONTENT_PUBLIC_RENDERER_WINDOW_FEATURES_CONVERTER_H_
 
 #include "content/common/content_export.h"
-#include "third_party/blink/public/mojom/window_features/window_features.mojom.h"
 #include "third_party/blink/public/web/web_window_features.h"
+#include "third_party/blink/public/web/window_features.mojom.h"
 
 namespace content {
 
diff --git a/content/renderer/navigation_state.cc b/content/renderer/navigation_state.cc
index f6ae1a9..bdf0236 100644
--- a/content/renderer/navigation_state.cc
+++ b/content/renderer/navigation_state.cc
@@ -10,7 +10,7 @@
 #include "content/common/frame_messages.h"
 #include "content/public/common/navigation_policy.h"
 #include "content/renderer/internal_document_state_data.h"
-#include "third_party/blink/public/mojom/commit_result/commit_result.mojom.h"
+#include "third_party/blink/public/web/commit_result.mojom.h"
 
 namespace content {
 
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index 85fc45a..fe02f31 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -77,7 +77,6 @@
 #include "third_party/blink/public/common/frame/frame_owner_element_type.h"
 #include "third_party/blink/public/mojom/autoplay/autoplay.mojom.h"
 #include "third_party/blink/public/mojom/choosers/file_chooser.mojom.h"
-#include "third_party/blink/public/mojom/commit_result/commit_result.mojom.h"
 #include "third_party/blink/public/mojom/devtools/console_message.mojom.h"
 #include "third_party/blink/public/mojom/fetch/fetch_api_request.mojom.h"
 #include "third_party/blink/public/mojom/manifest/manifest_manager.mojom.h"
@@ -87,6 +86,7 @@
 #include "third_party/blink/public/platform/web_focus_type.h"
 #include "third_party/blink/public/platform/web_loading_behavior_flag.h"
 #include "third_party/blink/public/platform/web_media_player.h"
+#include "third_party/blink/public/web/commit_result.mojom.h"
 #include "third_party/blink/public/web/web_ax_object.h"
 #include "third_party/blink/public/web/web_document_loader.h"
 #include "third_party/blink/public/web/web_frame_load_type.h"
diff --git a/third_party/blink/public/BUILD.gn b/third_party/blink/public/BUILD.gn
index ec83aa0..37b6b0b 100644
--- a/third_party/blink/public/BUILD.gn
+++ b/third_party/blink/public/BUILD.gn
@@ -659,6 +659,10 @@
     "platform/modules/idle/idle_manager.mojom",
     "platform/modules/notifications/notification_service.mojom",
     "platform/modules/webdatabase/web_database.mojom",
+    "web/commit_result.mojom",
+    "web/devtools_frontend.mojom",
+    "web/selection_menu_behavior.mojom",
+    "web/window_features.mojom",
   ]
   public_deps = [
     ":android_mojo_bindings",
@@ -712,6 +716,7 @@
     "platform/modules/installedapp/related_application.mojom",
     "platform/modules/mediasession/media_session.mojom",
     "platform/modules/webauthn/authenticator.mojom",
+    "web/remote_objects.mojom",
   ]
   public_deps = [
     "//mojo/public/mojom/base",
diff --git a/third_party/blink/public/mojom/BUILD.gn b/third_party/blink/public/mojom/BUILD.gn
index 353d6c24..fc49392 100644
--- a/third_party/blink/public/mojom/BUILD.gn
+++ b/third_party/blink/public/mojom/BUILD.gn
@@ -29,14 +29,12 @@
     "choosers/color_chooser.mojom",
     "choosers/file_chooser.mojom",
     "clipboard/clipboard.mojom",
-    "commit_result/commit_result.mojom",
     "contacts/contacts_manager.mojom",
     "cookie_store/cookie_store.mojom",
     "crash/crash_memory_metrics_reporter.mojom",
     "csp/content_security_policy.mojom",
     "devtools/console_message.mojom",
     "devtools/devtools_agent.mojom",
-    "devtools/devtools_frontend.mojom",
     "dom_storage/session_storage_namespace.mojom",
     "dom_storage/storage_area.mojom",
     "dom_storage/storage_partition_service.mojom",
@@ -85,7 +83,6 @@
     "renderer_preferences.mojom",
     "reporting/reporting.mojom",
     "script/script_type.mojom",
-    "selection_menu/selection_menu_behavior.mojom",
     "serial/serial.mojom",
     "service_worker/dispatch_fetch_event_params.mojom",
     "service_worker/navigation_preload_state.mojom",
@@ -108,7 +105,6 @@
     "v8_cache_options.mojom",
     "wake_lock/wake_lock.mojom",
     "webaudio/audio_context_manager.mojom",
-    "window_features/window_features.mojom",
     "worker/shared_worker.mojom",
     "worker/shared_worker_client.mojom",
     "worker/shared_worker_connector.mojom",
@@ -167,20 +163,17 @@
 
 # Kept separate from "mojom_platform" because the Java bindings are specifically
 # needed by Android's implementation of payments and webshare
-# (in components/payments/content/android and chrome/android/),
-# input (in android_webview/ and content/browser/android/) and
-# remote objects(in content/public/android/).
+# (in components/payments/content/android and chrome/android/)
+# and input (in android_webview/ and content/browser/android/).
 mojom("android_mojo_bindings") {
   sources = [
     "input/input_host.mojom",
     "input/input_messages.mojom",
     "payments/payment_request.mojom",
-    "remote_objects/remote_objects.mojom",
     "webshare/webshare.mojom",
   ]
   public_deps = [
     "//components/payments/mojom",
-    "//mojo/public/mojom/base",
     "//url/mojom:url_mojom_gurl",
     "//url/mojom:url_mojom_origin",
   ]
diff --git a/third_party/blink/public/mojom/commit_result/OWNERS b/third_party/blink/public/mojom/commit_result/OWNERS
deleted file mode 100644
index 08850f4..0000000
--- a/third_party/blink/public/mojom/commit_result/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-per-file *.mojom=set noparent
-per-file *.mojom=file://ipc/SECURITY_OWNERS
diff --git a/third_party/blink/public/mojom/remote_objects/OWNERS b/third_party/blink/public/mojom/remote_objects/OWNERS
deleted file mode 100644
index 08850f4..0000000
--- a/third_party/blink/public/mojom/remote_objects/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-per-file *.mojom=set noparent
-per-file *.mojom=file://ipc/SECURITY_OWNERS
diff --git a/third_party/blink/public/mojom/selection_menu/OWNERS b/third_party/blink/public/mojom/selection_menu/OWNERS
deleted file mode 100644
index 08850f4..0000000
--- a/third_party/blink/public/mojom/selection_menu/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-per-file *.mojom=set noparent
-per-file *.mojom=file://ipc/SECURITY_OWNERS
diff --git a/third_party/blink/public/mojom/window_features/OWNERS b/third_party/blink/public/mojom/window_features/OWNERS
deleted file mode 100644
index 08850f4..0000000
--- a/third_party/blink/public/mojom/window_features/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-per-file *.mojom=set noparent
-per-file *.mojom=file://ipc/SECURITY_OWNERS
diff --git a/third_party/blink/public/mojom/commit_result/commit_result.mojom b/third_party/blink/public/web/commit_result.mojom
similarity index 100%
rename from third_party/blink/public/mojom/commit_result/commit_result.mojom
rename to third_party/blink/public/web/commit_result.mojom
diff --git a/third_party/blink/public/mojom/devtools/devtools_frontend.mojom b/third_party/blink/public/web/devtools_frontend.mojom
similarity index 100%
rename from third_party/blink/public/mojom/devtools/devtools_frontend.mojom
rename to third_party/blink/public/web/devtools_frontend.mojom
diff --git a/third_party/blink/public/mojom/remote_objects/remote_objects.mojom b/third_party/blink/public/web/remote_objects.mojom
similarity index 100%
rename from third_party/blink/public/mojom/remote_objects/remote_objects.mojom
rename to third_party/blink/public/web/remote_objects.mojom
diff --git a/third_party/blink/public/mojom/selection_menu/selection_menu_behavior.mojom b/third_party/blink/public/web/selection_menu_behavior.mojom
similarity index 100%
rename from third_party/blink/public/mojom/selection_menu/selection_menu_behavior.mojom
rename to third_party/blink/public/web/selection_menu_behavior.mojom
diff --git a/third_party/blink/public/web/web_local_frame.h b/third_party/blink/public/web/web_local_frame.h
index adcb4e2..5b96e0e 100644
--- a/third_party/blink/public/web/web_local_frame.h
+++ b/third_party/blink/public/web/web_local_frame.h
@@ -13,15 +13,15 @@
 #include "third_party/blink/public/common/feature_policy/feature_policy.h"
 #include "third_party/blink/public/common/frame/sandbox_flags.h"
 #include "third_party/blink/public/mojom/ad_tagging/ad_frame.mojom-shared.h"
-#include "third_party/blink/public/mojom/commit_result/commit_result.mojom-shared.h"
 #include "third_party/blink/public/mojom/fetch/fetch_api_request.mojom-shared.h"
 #include "third_party/blink/public/mojom/frame/lifecycle.mojom-shared.h"
-#include "third_party/blink/public/mojom/selection_menu/selection_menu_behavior.mojom-shared.h"
 #include "third_party/blink/public/platform/task_type.h"
 #include "third_party/blink/public/platform/web_focus_type.h"
 #include "third_party/blink/public/platform/web_size.h"
 #include "third_party/blink/public/platform/web_url_error.h"
 #include "third_party/blink/public/platform/web_url_request.h"
+#include "third_party/blink/public/web/commit_result.mojom-shared.h"
+#include "third_party/blink/public/web/selection_menu_behavior.mojom-shared.h"
 #include "third_party/blink/public/web/web_document_loader.h"
 #include "third_party/blink/public/web/web_frame.h"
 #include "third_party/blink/public/web/web_frame_load_type.h"
diff --git a/third_party/blink/public/mojom/window_features/window_features.mojom b/third_party/blink/public/web/window_features.mojom
similarity index 100%
rename from third_party/blink/public/mojom/window_features/window_features.mojom
rename to third_party/blink/public/web/window_features.mojom
diff --git a/third_party/blink/renderer/controller/dev_tools_frontend_impl.h b/third_party/blink/renderer/controller/dev_tools_frontend_impl.h
index ec54e12..b5777f2 100644
--- a/third_party/blink/renderer/controller/dev_tools_frontend_impl.h
+++ b/third_party/blink/renderer/controller/dev_tools_frontend_impl.h
@@ -33,7 +33,7 @@
 
 #include "base/macros.h"
 #include "mojo/public/cpp/bindings/associated_binding.h"
-#include "third_party/blink/public/mojom/devtools/devtools_frontend.mojom-blink.h"
+#include "third_party/blink/public/web/devtools_frontend.mojom-blink.h"
 #include "third_party/blink/renderer/core/inspector/inspector_frontend_client.h"
 #include "third_party/blink/renderer/platform/heap/handle.h"
 #include "third_party/blink/renderer/platform/supplementable.h"
diff --git a/third_party/blink/renderer/core/loader/frame_loader.cc b/third_party/blink/renderer/core/loader/frame_loader.cc
index b6fd6b5..fef422f 100644
--- a/third_party/blink/renderer/core/loader/frame_loader.cc
+++ b/third_party/blink/renderer/core/loader/frame_loader.cc
@@ -42,7 +42,6 @@
 #include "base/unguessable_token.h"
 #include "services/network/public/mojom/request_context_frame_type.mojom-blink.h"
 #include "third_party/blink/public/common/features.h"
-#include "third_party/blink/public/mojom/commit_result/commit_result.mojom-shared.h"
 #include "third_party/blink/public/mojom/fetch/fetch_api_request.mojom-shared.h"
 #include "third_party/blink/public/mojom/frame/navigation_initiator.mojom-blink.h"
 #include "third_party/blink/public/platform/modules/service_worker/web_service_worker_network_provider.h"
@@ -51,6 +50,7 @@
 #include "third_party/blink/public/platform/web_mixed_content.h"
 #include "third_party/blink/public/platform/web_mixed_content_context_type.h"
 #include "third_party/blink/public/platform/web_url_request.h"
+#include "third_party/blink/public/web/commit_result.mojom-shared.h"
 #include "third_party/blink/public/web/web_frame_load_type.h"
 #include "third_party/blink/public/web/web_history_item.h"
 #include "third_party/blink/public/web/web_navigation_params.h"