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

This reverts commit d7213e95.

Reason for revert: This CL causes a build break on bots.

Original change's description:
> Replace .mojom-blink.h with .mojom-blink-forward.h in blink - 13
> 
> 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: I42c62234c64878d23057366df8823eb94a8a5e6e
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1852354
> Commit-Queue: Gyuyoung Kim <gyuyoung@igalia.com>
> Reviewed-by: Kent Tamura <tkent@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#705021}

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

Change-Id: I336b7ba2e61ce33e829255d40643e44c68927ccc
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1001360
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1855546Reviewed-by: Gyuyoung Kim <gyuyoung@igalia.com>
Commit-Queue: Gyuyoung Kim <gyuyoung@igalia.com>
Cr-Commit-Position: refs/heads/master@{#705024}

third_party/blink/renderer/modules/vr/DEPS

 include_rules = [
     "+mojo/public/cpp/bindings/binding.h",
     "+device/vr/public/mojom/vr_service.mojom-blink.h",
-    "+device/vr/public/mojom/vr_service.mojom-blink-forward.h",
     "+gpu/command_buffer/client/gles2_interface.h",
     "+ui/gfx/geometry",
     "+services/metrics/public/cpp/ukm_builders.h"

third_party/blink/renderer/modules/vr/vr_pose.cc

@@ -4,8 +4,6 @@
 
 #include "third_party/blink/renderer/modules/vr/vr_pose.h"
 
-#include "device/vr/public/mojom/vr_service.mojom-blink.h"
-
 namespace blink {
 
 namespace {

third_party/blink/renderer/modules/vr/vr_pose.h

@@ -5,7 +5,7 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_VR_VR_POSE_H_
 #define THIRD_PARTY_BLINK_RENDERER_MODULES_VR_VR_POSE_H_
 
-#include "device/vr/public/mojom/vr_service.mojom-blink-forward.h"
+#include "device/vr/public/mojom/vr_service.mojom-blink.h"
 #include "third_party/blink/renderer/core/typed_arrays/dom_typed_array.h"
 #include "third_party/blink/renderer/platform/bindings/script_wrappable.h"
 #include "third_party/blink/renderer/platform/heap/handle.h"

third_party/blink/renderer/modules/vr/vr_stage_parameters.cc

@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 #include "third_party/blink/renderer/modules/vr/vr_stage_parameters.h"
-#include "device/vr/public/mojom/vr_service.mojom-blink.h"
 #include "third_party/blink/renderer/modules/xr/xr_utils.h"
 #include "third_party/blink/renderer/platform/transforms/transformation_matrix.h"
 

third_party/blink/renderer/modules/vr/vr_stage_parameters.h

@@ -5,7 +5,7 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_VR_VR_STAGE_PARAMETERS_H_
 #define THIRD_PARTY_BLINK_RENDERER_MODULES_VR_VR_STAGE_PARAMETERS_H_
 
-#include "device/vr/public/mojom/vr_service.mojom-blink-forward.h"
+#include "device/vr/public/mojom/vr_service.mojom-blink.h"
 #include "third_party/blink/renderer/core/typed_arrays/dom_typed_array.h"
 #include "third_party/blink/renderer/platform/bindings/script_wrappable.h"
 #include "third_party/blink/renderer/platform/heap/handle.h"

third_party/blink/renderer/modules/wake_lock/wake_lock_state_record.h

@@ -7,7 +7,7 @@
 
 #include "base/gtest_prod_util.h"
 #include "mojo/public/cpp/bindings/remote.h"
-#include "services/device/public/mojom/wake_lock.mojom-blink-forward.h"
+#include "services/device/public/mojom/wake_lock.mojom-blink.h"
 #include "third_party/blink/renderer/modules/modules_export.h"
 #include "third_party/blink/renderer/modules/wake_lock/wake_lock_type.h"
 #include "third_party/blink/renderer/platform/heap/handle.h"

third_party/blink/renderer/modules/wake_lock/wake_lock_test_utils.h

@@ -11,7 +11,7 @@
 #include "mojo/public/cpp/bindings/pending_remote.h"
 #include "mojo/public/cpp/bindings/receiver.h"
 #include "mojo/public/cpp/bindings/receiver_set.h"
-#include "services/device/public/mojom/wake_lock.mojom-blink-forward.h"
+#include "services/device/public/mojom/wake_lock.mojom-blink.h"
 #include "third_party/blink/public/mojom/permissions/permission.mojom-blink.h"
 #include "third_party/blink/public/mojom/wake_lock/wake_lock.mojom-blink.h"
 #include "third_party/blink/renderer/bindings/core/v8/script_function.h"

third_party/blink/renderer/modules/webmidi/DEPS

 include_rules = [
     "+media/midi/midi_service.mojom-blink.h",
-    "+media/midi/midi_service.mojom-blink-forward.h",
     "-third_party/blink/renderer/modules",
     "+third_party/blink/renderer/modules/event_modules.h",
     "+third_party/blink/renderer/modules/event_target_modules.h",

third_party/blink/renderer/modules/webmidi/midi_access.h

@@ -32,7 +32,7 @@
 #define THIRD_PARTY_BLINK_RENDERER_MODULES_WEBMIDI_MIDI_ACCESS_H_
 
 #include <memory>
-#include "media/midi/midi_service.mojom-blink-forward.h"
+#include "media/midi/midi_service.mojom-blink.h"
 #include "third_party/blink/renderer/bindings/core/v8/active_script_wrappable.h"
 #include "third_party/blink/renderer/bindings/core/v8/script_promise.h"
 #include "third_party/blink/renderer/core/execution_context/context_lifecycle_observer.h"

third_party/blink/renderer/modules/webmidi/midi_access_initializer.h

@@ -6,10 +6,10 @@
 #define THIRD_PARTY_BLINK_RENDERER_MODULES_WEBMIDI_MIDI_ACCESS_INITIALIZER_H_
 
 #include <memory>
-#include "media/midi/midi_service.mojom-blink-forward.h"
+#include "media/midi/midi_service.mojom-blink.h"
 #include "mojo/public/cpp/bindings/remote.h"
 #include "third_party/blink/public/mojom/permissions/permission.mojom-blink.h"
-#include "third_party/blink/public/mojom/permissions/permission_status.mojom-blink-forward.h"
+#include "third_party/blink/public/mojom/permissions/permission_status.mojom-blink.h"
 #include "third_party/blink/renderer/bindings/core/v8/script_promise.h"
 #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
 #include "third_party/blink/renderer/modules/modules_export.h"

third_party/blink/renderer/modules/webmidi/midi_input.h

@@ -31,7 +31,7 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_WEBMIDI_MIDI_INPUT_H_
 #define THIRD_PARTY_BLINK_RENDERER_MODULES_WEBMIDI_MIDI_INPUT_H_
 
-#include "media/midi/midi_service.mojom-blink-forward.h"
+#include "media/midi/midi_service.mojom-blink.h"
 #include "third_party/blink/renderer/modules/event_target_modules.h"
 #include "third_party/blink/renderer/modules/webmidi/midi_port.h"
 

third_party/blink/renderer/modules/webmidi/midi_port.h

@@ -31,7 +31,7 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_WEBMIDI_MIDI_PORT_H_
 #define THIRD_PARTY_BLINK_RENDERER_MODULES_WEBMIDI_MIDI_PORT_H_
 
-#include "media/midi/midi_service.mojom-blink-forward.h"
+#include "media/midi/midi_service.mojom-blink.h"
 #include "third_party/blink/renderer/bindings/core/v8/active_script_wrappable.h"
 #include "third_party/blink/renderer/bindings/core/v8/script_promise.h"
 #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"

third_party/blink/renderer/modules/websockets/mock_websocket_channel.h

@@ -9,7 +9,7 @@
 
 #include "base/memory/scoped_refptr.h"
 #include "testing/gmock/include/gmock/gmock.h"
-#include "third_party/blink/public/mojom/devtools/console_message.mojom-blink-forward.h"
+#include "third_party/blink/public/mojom/devtools/console_message.mojom-blink.h"
 #include "third_party/blink/renderer/core/typed_arrays/dom_array_buffer.h"
 #include "third_party/blink/renderer/modules/websockets/websocket_channel.h"
 #include "third_party/blink/renderer/platform/blob/blob_data.h"

third_party/blink/renderer/modules/websockets/websocket_channel_impl.h

@@ -42,7 +42,7 @@
 #include "mojo/public/cpp/bindings/remote.h"
 #include "mojo/public/cpp/system/simple_watcher.h"
 #include "services/network/public/mojom/websocket.mojom-blink.h"
-#include "third_party/blink/public/mojom/websockets/websocket_connector.mojom-blink-forward.h"
+#include "third_party/blink/public/mojom/websockets/websocket_connector.mojom-blink.h"
 #include "third_party/blink/renderer/bindings/core/v8/source_location.h"
 #include "third_party/blink/renderer/core/fileapi/blob.h"
 #include "third_party/blink/renderer/modules/modules_export.h"

third_party/blink/renderer/modules/websockets/websocket_channel_impl_test.cc

@@ -14,7 +14,6 @@
 #include "mojo/public/cpp/bindings/receiver_set.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/blink/public/mojom/websockets/websocket_connector.mojom-blink.h"
 #include "third_party/blink/public/platform/web_url.h"
 #include "third_party/blink/public/platform/websocket_handshake_throttle.h"
 #include "third_party/blink/renderer/core/dom/document.h"

third_party/blink/renderer/modules/webusb/usb.h

@@ -7,7 +7,7 @@
 
 #include "mojo/public/cpp/bindings/associated_receiver.h"
 #include "mojo/public/cpp/bindings/remote.h"
-#include "services/device/public/mojom/usb_manager.mojom-blink-forward.h"
+#include "services/device/public/mojom/usb_manager.mojom-blink.h"
 #include "services/device/public/mojom/usb_manager_client.mojom-blink.h"
 #include "third_party/blink/public/mojom/usb/web_usb_service.mojom-blink.h"
 #include "third_party/blink/renderer/bindings/core/v8/script_promise.h"

third_party/blink/renderer/modules/xr/type_converters.h

@@ -5,7 +5,7 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_XR_TYPE_CONVERTERS_H_
 #define THIRD_PARTY_BLINK_RENDERER_MODULES_XR_TYPE_CONVERTERS_H_
 
-#include "device/vr/public/mojom/vr_service.mojom-blink-forward.h"
+#include "device/vr/public/mojom/vr_service.mojom-blink.h"
 #include "third_party/blink/renderer/core/geometry/dom_point_read_only.h"
 #include "third_party/blink/renderer/modules/xr/xr_plane.h"
 #include "third_party/blink/renderer/platform/transforms/transformation_matrix.h"

third_party/blink/renderer/modules/xr/xr_anchor.h

@@ -8,7 +8,7 @@
 #include <memory>
 
 #include "base/optional.h"
-#include "device/vr/public/mojom/vr_service.mojom-blink-forward.h"
+#include "device/vr/public/mojom/vr_service.mojom-blink.h"
 #include "third_party/blink/renderer/platform/bindings/script_wrappable.h"
 #include "third_party/blink/renderer/platform/transforms/transformation_matrix.h"
 

third_party/blink/renderer/modules/xr/xr_frame.h

@@ -7,7 +7,7 @@
 
 #include <memory>
 
-#include "device/vr/public/mojom/vr_service.mojom-blink-forward.h"
+#include "device/vr/public/mojom/vr_service.mojom-blink.h"
 #include "third_party/blink/renderer/bindings/core/v8/script_promise.h"
 #include "third_party/blink/renderer/platform/bindings/script_wrappable.h"
 #include "third_party/blink/renderer/platform/heap/handle.h"

third_party/blink/renderer/modules/xr/xr_hit_test_source.cc

@@ -4,7 +4,6 @@
 
 #include "third_party/blink/renderer/modules/xr/xr_hit_test_source.h"
 
-#include "device/vr/public/mojom/vr_service.mojom-blink.h"
 #include "third_party/blink/renderer/modules/xr/xr_hit_test_options.h"
 #include "third_party/blink/renderer/modules/xr/xr_hit_test_result.h"
 

third_party/blink/renderer/modules/xr/xr_hit_test_source.h

@@ -9,7 +9,7 @@
 
 #include "third_party/blink/renderer/platform/bindings/script_wrappable.h"
 
-#include "device/vr/public/mojom/vr_service.mojom-blink-forward.h"
+#include "device/vr/public/mojom/vr_service.mojom-blink.h"
 #include "third_party/blink/renderer/platform/transforms/transformation_matrix.h"
 
 namespace blink {

third_party/blink/renderer/modules/xr/xr_input_source.h

@@ -5,7 +5,7 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_XR_XR_INPUT_SOURCE_H_
 #define THIRD_PARTY_BLINK_RENDERER_MODULES_XR_XR_INPUT_SOURCE_H_
 
-#include "device/vr/public/mojom/vr_service.mojom-blink-forward.h"
+#include "device/vr/public/mojom/vr_service.mojom-blink.h"
 #include "third_party/blink/renderer/modules/gamepad/gamepad.h"
 #include "third_party/blink/renderer/modules/xr/xr_native_origin_information.h"
 #include "third_party/blink/renderer/platform/bindings/script_wrappable.h"