Revert "Replace .mojom-blink.h with .mojom-blink-forward.h in blink - 7"

This reverts commit 1886f107.

Reason for revert: Looks like this broke the build, e.g.
https://ci.chromium.org/p/chromium/builders/ci/linux-archive-rel/10940
https://ci.chromium.org/p/chromium/builders/ci/Win%20Builder/81787
https://ci.chromium.org/p/chromium/builders/ci/Win%20x64%20Builder/80241

Original change's description:
> Replace .mojom-blink.h with .mojom-blink-forward.h in blink - 7
> 
> To reduce pre-processed size of header files have been including
> foo.mojom-blink.h, this CL replaces .mojom-blink.h with
> .mojom-blink-forward.h in blink header files.
> 
> This CL has no behavior changes and following CLs will
> continue replacing them more.
> 
> Bug: 1001360
> Change-Id: Ic627fb1cb10815ee58ba107a9fa4fc98f5884aa6
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1844527
> Reviewed-by: Kent Tamura <tkent@chromium.org>
> Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
> Commit-Queue: Gyuyoung Kim <gyuyoung@igalia.com>
> Cr-Commit-Position: refs/heads/master@{#703686}

TBR=kinuko@chromium.org,tkent@chromium.org,gyuyoung@igalia.com

Change-Id: I62773d78577ee622fee300e3cf5d51de990714ce
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1001360
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1847298Reviewed-by: Marc Treib <treib@chromium.org>
Commit-Queue: Marc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#703687}

third_party/blink/renderer/bindings/modules/v8/serialization/v8_script_value_serializer_for_modules_test.cc

@@ -7,7 +7,6 @@
 #include "build/build_config.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/blink/public/mojom/filesystem/file_system.mojom-blink.h"
 #include "third_party/blink/public/platform/platform.h"
 #include "third_party/blink/public/platform/scheduler/test/renderer_scheduler_test_support.h"
 #include "third_party/blink/public/platform/web_crypto_algorithm_params.h"

third_party/blink/renderer/modules/DEPS

@@ -4,7 +4,7 @@ include_rules = [
     "+base/strings/char_traits.h",
     "+mojo/public/cpp/bindings",
     "+services/network/public/cpp/shared_url_loader_factory.h",
-    "+services/service_manager/public/mojom/interface_provider.mojom-blink-forward.h",
+    "+services/service_manager/public/mojom/interface_provider.mojom-blink.h",
     "+services/viz/public/mojom/hit_test/hit_test_region_list.mojom-blink.h",
     "+third_party/blink/public/common",
     "+third_party/blink/public/web",

third_party/blink/renderer/modules/cache_storage/inspector_cache_storage_agent.h

@@ -9,7 +9,7 @@
 
 #include "base/macros.h"
 #include "mojo/public/cpp/bindings/remote.h"
-#include "third_party/blink/public/mojom/cache_storage/cache_storage.mojom-blink-forward.h"
+#include "third_party/blink/public/mojom/cache_storage/cache_storage.mojom-blink.h"
 #include "third_party/blink/renderer/core/inspector/inspector_base_agent.h"
 #include "third_party/blink/renderer/core/inspector/protocol/CacheStorage.h"
 #include "third_party/blink/renderer/modules/modules_export.h"

third_party/blink/renderer/modules/cookie_store/cookie_store.h

@@ -7,7 +7,7 @@
 
 #include "mojo/public/cpp/bindings/receiver.h"
 #include "mojo/public/cpp/bindings/remote.h"
-#include "services/network/public/mojom/restricted_cookie_manager.mojom-blink-forward.h"
+#include "services/network/public/mojom/restricted_cookie_manager.mojom-blink.h"
 #include "third_party/blink/public/mojom/cookie_store/cookie_store.mojom-blink.h"
 #include "third_party/blink/public/platform/web_canonical_cookie.h"
 #include "third_party/blink/renderer/bindings/core/v8/script_promise.h"

third_party/blink/renderer/modules/credentialmanager/authenticator_attestation_response.h

@@ -5,7 +5,7 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_CREDENTIALMANAGER_AUTHENTICATOR_ATTESTATION_RESPONSE_H_
 #define THIRD_PARTY_BLINK_RENDERER_MODULES_CREDENTIALMANAGER_AUTHENTICATOR_ATTESTATION_RESPONSE_H_
 
-#include "third_party/blink/public/mojom/webauthn/authenticator.mojom-blink-forward.h"
+#include "third_party/blink/public/mojom/webauthn/authenticator.mojom-blink.h"
 #include "third_party/blink/renderer/core/typed_arrays/dom_array_buffer.h"
 #include "third_party/blink/renderer/modules/credentialmanager/authenticator_response.h"
 #include "third_party/blink/renderer/modules/modules_export.h"

third_party/blink/renderer/modules/credentialmanager/credential_manager_type_converters.cc

@@ -8,7 +8,6 @@
 #include <utility>
 
 #include "build/build_config.h"
-#include "third_party/blink/public/mojom/webauthn/authenticator.mojom-blink.h"
 #include "third_party/blink/renderer/bindings/core/v8/array_buffer_or_array_buffer_view.h"
 #include "third_party/blink/renderer/modules/credentialmanager/authenticator_selection_criteria.h"
 #include "third_party/blink/renderer/modules/credentialmanager/cable_authentication_data.h"

third_party/blink/renderer/modules/credentialmanager/credential_manager_type_converters.h

@@ -8,7 +8,7 @@
 #include "base/optional.h"
 
 #include "third_party/blink/public/mojom/credentialmanager/credential_manager.mojom-blink.h"
-#include "third_party/blink/public/mojom/webauthn/authenticator.mojom-blink-forward.h"
+#include "third_party/blink/public/mojom/webauthn/authenticator.mojom-blink.h"
 #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
 #include "third_party/blink/renderer/platform/wtf/vector.h"
 

third_party/blink/renderer/modules/device_orientation/DEPS

@@ -2,7 +2,6 @@ include_rules = [
     "+base/run_loop.h",
     "+mojo/public/cpp/bindings/binding.h",
     "+services/device/public/mojom/sensor.mojom-blink.h",
-    "+services/device/public/mojom/sensor.mojom-blink-forward.h",
     "+services/device/public/mojom/sensor_provider.mojom-blink.h",
     "+services/device/public/cpp/test/fake_sensor_and_provider.h",
     "+services/device/public/cpp/generic_sensor/sensor_reading.h",

third_party/blink/renderer/modules/device_orientation/device_sensor_entry.h

@@ -7,7 +7,7 @@
 
 #include "mojo/public/cpp/bindings/receiver.h"
 #include "mojo/public/cpp/bindings/remote.h"
-#include "services/device/public/mojom/sensor.mojom-blink-forward.h"
+#include "services/device/public/mojom/sensor.mojom-blink.h"
 #include "services/device/public/mojom/sensor_provider.mojom-blink.h"
 #include "third_party/blink/renderer/platform/heap/handle.h"
 

third_party/blink/renderer/modules/document_metadata/copyless_paste_extractor.h

@@ -5,7 +5,7 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_DOCUMENT_METADATA_COPYLESS_PASTE_EXTRACTOR_H_
 #define THIRD_PARTY_BLINK_RENDERER_MODULES_DOCUMENT_METADATA_COPYLESS_PASTE_EXTRACTOR_H_
 
-#include "third_party/blink/public/mojom/document_metadata/copyless_paste.mojom-blink-forward.h"
+#include "third_party/blink/public/mojom/document_metadata/copyless_paste.mojom-blink.h"
 #include "third_party/blink/renderer/modules/modules_export.h"
 #include "third_party/blink/renderer/platform/wtf/allocator/allocator.h"
 

third_party/blink/renderer/modules/exported/web_dom_file_system.cc

@@ -30,7 +30,6 @@
 
 #include "third_party/blink/public/web/web_dom_file_system.h"
 
-#include "third_party/blink/public/mojom/filesystem/file_system.mojom-blink.h"
 #include "third_party/blink/renderer/bindings/modules/v8/v8_directory_entry.h"
 #include "third_party/blink/renderer/bindings/modules/v8/v8_dom_file_system.h"
 #include "third_party/blink/renderer/bindings/modules/v8/v8_file_entry.h"

third_party/blink/renderer/modules/exported/web_embedded_worker_impl.h

@@ -36,8 +36,8 @@
 #include "base/macros.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
 #include "services/service_manager/public/cpp/interface_provider.h"
-#include "services/service_manager/public/mojom/interface_provider.mojom-blink-forward.h"
-#include "third_party/blink/public/mojom/cache_storage/cache_storage.mojom-blink-forward.h"
+#include "services/service_manager/public/mojom/interface_provider.mojom-blink.h"
+#include "third_party/blink/public/mojom/cache_storage/cache_storage.mojom-blink.h"
 #include "third_party/blink/public/web/web_embedded_worker.h"
 #include "third_party/blink/public/web/web_embedded_worker_start_data.h"
 #include "third_party/blink/renderer/core/workers/global_scope_creation_params.h"

third_party/blink/renderer/modules/filesystem/dev_tools_host_file_system.cc

@@ -4,7 +4,6 @@
 
 #include "third_party/blink/renderer/modules/filesystem/dev_tools_host_file_system.h"
 
-#include "third_party/blink/public/mojom/filesystem/file_system.mojom-blink.h"
 #include "third_party/blink/renderer/core/dom/document.h"
 #include "third_party/blink/renderer/core/frame/local_frame.h"
 #include "third_party/blink/renderer/core/inspector/dev_tools_host.h"

third_party/blink/renderer/modules/filesystem/dom_file_system_base.h

@@ -31,7 +31,7 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_FILESYSTEM_DOM_FILE_SYSTEM_BASE_H_
 #define THIRD_PARTY_BLINK_RENDERER_MODULES_FILESYSTEM_DOM_FILE_SYSTEM_BASE_H_
 
-#include "third_party/blink/public/mojom/filesystem/file_system.mojom-blink-forward.h"
+#include "third_party/blink/public/mojom/filesystem/file_system.mojom-blink.h"
 #include "third_party/blink/renderer/core/fileapi/file_error.h"
 #include "third_party/blink/renderer/modules/filesystem/file_system_callbacks.h"
 #include "third_party/blink/renderer/modules/filesystem/file_system_flags.h"

third_party/blink/renderer/modules/filesystem/dom_file_system_base_test.cc

@@ -5,7 +5,6 @@
 #include "third_party/blink/renderer/modules/filesystem/dom_file_system_base.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/blink/public/mojom/filesystem/file_system.mojom-blink.h"
 #include "third_party/blink/renderer/core/fileapi/file.h"
 #include "third_party/blink/renderer/platform/testing/unit_test_helpers.h"
 

third_party/blink/renderer/modules/filesystem/entry.cc

@@ -29,7 +29,6 @@
  */
 #include "third_party/blink/renderer/modules/filesystem/entry.h"
 
-#include "third_party/blink/public/mojom/filesystem/file_system.mojom-blink.h"
 #include "third_party/blink/renderer/core/execution_context/execution_context.h"
 #include "third_party/blink/renderer/core/fileapi/file_error.h"
 #include "third_party/blink/renderer/core/frame/web_feature.h"

third_party/blink/renderer/modules/filesystem/file_system_callbacks.h

@@ -33,7 +33,7 @@
 
 #include <memory>
 
-#include "third_party/blink/public/mojom/filesystem/file_system.mojom-blink-forward.h"
+#include "third_party/blink/public/mojom/filesystem/file_system.mojom-blink.h"
 #include "third_party/blink/renderer/bindings/core/v8/v8_void_callback.h"
 #include "third_party/blink/renderer/bindings/modules/v8/v8_entry_callback.h"
 #include "third_party/blink/renderer/bindings/modules/v8/v8_error_callback.h"

third_party/blink/renderer/modules/filesystem/local_file_system.h

@@ -35,7 +35,7 @@
 
 #include "base/callback.h"
 #include "base/macros.h"
-#include "third_party/blink/public/mojom/filesystem/file_system.mojom-blink-forward.h"
+#include "third_party/blink/public/mojom/filesystem/file_system.mojom-blink.h"
 #include "third_party/blink/renderer/core/frame/local_frame.h"
 #include "third_party/blink/renderer/core/workers/worker_global_scope.h"
 #include "third_party/blink/renderer/platform/bindings/name_client.h"

third_party/blink/renderer/modules/gamepad/DEPS

@@ -6,7 +6,6 @@ include_rules = [
     "+device/gamepad/public/cpp/gamepads.h",
 
     "+device/gamepad/public/mojom/gamepad.mojom-blink.h",
-    "+device/gamepad/public/mojom/gamepad.mojom-blink-forward.h",
     "+device/gamepad/public/mojom/gamepad_hardware_buffer.h",
     "+mojo/public/cpp/bindings/binding.h",
     "+mojo/public/cpp/system/buffer.h",

third_party/blink/renderer/modules/gamepad/gamepad_haptic_actuator.h

@@ -5,7 +5,7 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_GAMEPAD_GAMEPAD_HAPTIC_ACTUATOR_H_
 #define THIRD_PARTY_BLINK_RENDERER_MODULES_GAMEPAD_GAMEPAD_HAPTIC_ACTUATOR_H_
 
-#include "device/gamepad/public/mojom/gamepad.mojom-blink-forward.h"
+#include "device/gamepad/public/mojom/gamepad.mojom-blink.h"
 #include "third_party/blink/renderer/core/execution_context/context_lifecycle_observer.h"
 #include "third_party/blink/renderer/platform/bindings/script_wrappable.h"
 #include "third_party/blink/renderer/platform/heap/member.h"