Revert "Reland "Decompose some Blink public mojom targets""

This reverts commit b65bd7c4.

Reason for revert:

Findit (https://goo.gl/kROfz5) identified CL at revision 747384 as the
culprit for failures in the build cycles as shown on:
https://analysis.chromium.org/waterfall/culprit?key=ag9zfmZpbmRpdC1mb3ItbWVyRAsSDVdmU3VzcGVjdGVkQ0wiMWNocm9taXVtL2I2NWJkN2M0Y2E1N2M3ZTE2NDA1MjRmZmE0MTRlMDAzZjk5MTIxMzYM

Sample Failed Build: https://ci.chromium.org/b/8886638127244438928

Sample Failed Step: compile

Original change's description:
> Reland "Decompose some Blink public mojom targets"
> 
> This is a reland of ae3270a7
> 
> The original CL made it through the CQ without triggering a compile
> step, hence the post-landing breakage.
> 
> This has now been tested locally under a debug configuration and
> will trigger Android compiles in the CQ, so it should be safe to
> re-land if it passes.
> 
> Original change's description:
> > Decompose some Blink public mojom targets
> >
> > This picks some low-hanging fruit in the effort to decompose Blink mojom
> > into smaller targets.
> >
> > Bug: 1058621
> > Change-Id: Iaf1a8efffa43f64ea7e618555262b929235ca2eb
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2088677
> > Reviewed-by: Kentaro Hara <haraken@chromium.org>
> > Commit-Queue: Ken Rockot <rockot@google.com>
> > Cr-Commit-Position: refs/heads/master@{#747044}
> 
> Bug: 1058621
> Change-Id: I11d8c1e996e1cf178616fd6736ba2d0f7b624edb
> Tbr: haraken@chromium.org
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2090012
> Reviewed-by: Ken Rockot <rockot@google.com>
> Commit-Queue: Ken Rockot <rockot@google.com>
> Cr-Commit-Position: refs/heads/master@{#747384}


Change-Id: I518018e9bc2df0cb7a4bad85212c9dc5d8123329
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1058621
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2090463
Cr-Commit-Position: refs/heads/master@{#747394}

chrome/android/BUILD.gn

@@ -397,7 +397,6 @@ android_library("chrome_java") {
     "//third_party/blink/public:blink_headers_java",
     "//third_party/blink/public/mojom:android_mojo_bindings_java",
     "//third_party/blink/public/mojom:mojom_platform_java",
-    "//third_party/blink/public/mojom/blob:blob_java",
     "//third_party/cacheinvalidation:cacheinvalidation_javalib",
     "//third_party/cacheinvalidation:cacheinvalidation_proto_java",
     "//third_party/gif_player:gif_player_java",

content/public/android/BUILD.gn

@@ -84,8 +84,6 @@ android_library("content_java") {
     "//third_party/blink/public/mojom:android_mojo_bindings_java",
     "//third_party/blink/public/mojom:mojom_core_java",
     "//third_party/blink/public/mojom:mojom_platform_java",
-    "//third_party/blink/public/mojom/blob:blob_java",
-    "//third_party/blink/public/mojom/native_file_system:native_file_system_java",
     "//third_party/jsr-305:jsr_305_javalib",
     "//ui/android:ui_java",
     "//ui/gfx/geometry/mojom:mojom_java",

third_party/blink/public/mojom/BUILD.gn

@@ -92,6 +92,12 @@ mojom("mojom_platform") {
     "mediastream/media_devices.mojom",
     "mediastream/media_stream.mojom",
     "mime/mime_registry.mojom",
+    "native_file_system/native_file_system_directory_handle.mojom",
+    "native_file_system/native_file_system_error.mojom",
+    "native_file_system/native_file_system_file_handle.mojom",
+    "native_file_system/native_file_system_file_writer.mojom",
+    "native_file_system/native_file_system_manager.mojom",
+    "native_file_system/native_file_system_transfer_token.mojom",
     "notifications/notification.mojom",
     "notifications/notification_service.mojom",
     "oom_intervention/oom_intervention.mojom",
@@ -100,6 +106,9 @@ mojom("mojom_platform") {
     "page/spatial_navigation.mojom",
     "payments/payment_app.mojom",
     "peerconnection/peer_connection_tracker.mojom",
+    "permissions/permission.mojom",
+    "permissions/permission_automation.mojom",
+    "permissions/permission_status.mojom",
     "picture_in_picture/picture_in_picture.mojom",
     "plugins/plugin_registry.mojom",
     "prerender/prerender.mojom",
@@ -113,6 +122,7 @@ mojom("mojom_platform") {
     "renderer_preferences.mojom",
     "reporting/reporting.mojom",
     "screen_enumeration/screen_enumeration.mojom",
+    "script/script_type.mojom",
     "scroll/scroll_enums.mojom",
     "scroll/scroll_into_view_params.mojom",
     "scroll/scrollbar_mode.mojom",
@@ -194,12 +204,8 @@ mojom("mojom_platform") {
     "//services/service_manager/public/mojom",
     "//services/viz/public/mojom",
     "//skia/public/mojom",
-    "//third_party/blink/public/mojom/blob",
     "//third_party/blink/public/mojom/dom_storage",
     "//third_party/blink/public/mojom/frame",
-    "//third_party/blink/public/mojom/native_file_system",
-    "//third_party/blink/public/mojom/permissions",
-    "//third_party/blink/public/mojom/script",
     "//third_party/blink/public/mojom/usb",
     "//ui/base/ime/mojom",
     "//ui/display/mojom",
@@ -240,6 +246,11 @@ mojom("mojom_platform") {
 mojom("android_mojo_bindings") {
   generate_java = true
   sources = [
+    "blob/blob.mojom",
+    "blob/blob_registry.mojom",
+    "blob/blob_url_store.mojom",
+    "blob/data_element.mojom",
+    "blob/serialized_blob.mojom",
     "document_metadata/document_metadata.mojom",
     "font_unique_name_lookup/font_unique_name_lookup.mojom",
     "input/input_host.mojom",
@@ -264,7 +275,6 @@ mojom("android_mojo_bindings") {
     "//mojo/public/mojom/base",
     "//services/media_session/public/mojom",
     "//services/network/public/mojom",
-    "//third_party/blink/public/mojom/blob",
     "//url/mojom:url_mojom_gurl",
     "//url/mojom:url_mojom_origin",
   ]
@@ -330,9 +340,6 @@ mojom("mojom_core") {
     "//services/network/public/mojom",
     "//services/service_manager/public/mojom",
     "//skia/public/mojom",
-    "//third_party/blink/public/mojom/blob",
-    "//third_party/blink/public/mojom/native_file_system",
-    "//third_party/blink/public/mojom/script",
     "//url/mojom:url_mojom_gurl",
     "//url/mojom:url_mojom_origin",
   ]

third_party/blink/public/mojom/blob/BUILD.gn

-# Copyright 2020 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//mojo/public/tools/bindings/mojom.gni")
-
-mojom_component("blob") {
-  output_prefix = "blink_blob_mojom"
-  macro_prefix = "BLINK_BLOB_MOJOM"
-
-  sources = [
-    "blob.mojom",
-    "blob_registry.mojom",
-    "blob_url_store.mojom",
-    "data_element.mojom",
-    "serialized_blob.mojom",
-  ]
-
-  public_deps = [
-    "//mojo/public/mojom/base",
-    "//services/network/public/mojom",
-    "//url/mojom:url_mojom_gurl",
-    "//url/mojom:url_mojom_origin",
-  ]
-
-  # The Blink variant is linked directly into the private platform
-  # implementation and so it requires the corresponding export configuration to
-  # override the normal mojom_component() target exports.
-  export_class_attribute_blink = "PLATFORM_EXPORT"
-  export_define_blink = "BLINK_PLATFORM_IMPLEMENTATION=1"
-  export_header_blink = "third_party/blink/renderer/platform/platform_export.h"
-
-  generate_java = true
-}

third_party/blink/public/mojom/native_file_system/BUILD.gn

-# Copyright 2020 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//mojo/public/tools/bindings/mojom.gni")
-
-mojom_component("native_file_system") {
-  output_prefix = "blink_native_file_system_mojom"
-  macro_prefix = "BLINK_NATIVE_FILE_SYSTEM_MOJOM"
-
-  sources = [
-    "native_file_system_directory_handle.mojom",
-    "native_file_system_error.mojom",
-    "native_file_system_file_handle.mojom",
-    "native_file_system_file_writer.mojom",
-    "native_file_system_manager.mojom",
-    "native_file_system_transfer_token.mojom",
-  ]
-
-  public_deps = [
-    "//mojo/public/mojom/base",
-    "//third_party/blink/public/mojom/blob",
-    "//third_party/blink/public/mojom/permissions",
-    "//url/mojom:url_mojom_origin",
-  ]
-
-  # The Blink variant is linked directly into the private platform
-  # implementation and so it requires the corresponding export configuration to
-  # override the normal mojom_component() target exports.
-  export_class_attribute_blink = "PLATFORM_EXPORT"
-  export_define_blink = "BLINK_PLATFORM_IMPLEMENTATION=1"
-  export_header_blink = "third_party/blink/renderer/platform/platform_export.h"
-
-  generate_java = true
-}

third_party/blink/public/mojom/permissions/BUILD.gn

-# Copyright 2020 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//mojo/public/tools/bindings/mojom.gni")
-
-mojom_component("permissions") {
-  output_prefix = "blink_permissions_mojom"
-  macro_prefix = "BLINK_PERMISSIONS_MOJOM"
-
-  sources = [
-    "permission.mojom",
-    "permission_automation.mojom",
-    "permission_status.mojom",
-  ]
-
-  public_deps = [ "//url/mojom:url_mojom_gurl" ]
-
-  # The Blink variant is linked directly into the private platform
-  # implementation and so it requires the corresponding export configuration to
-  # override the normal mojom_component() target exports.
-  export_class_attribute_blink = "PLATFORM_EXPORT"
-  export_define_blink = "BLINK_PLATFORM_IMPLEMENTATION=1"
-  export_header_blink = "third_party/blink/renderer/platform/platform_export.h"
-
-  generate_java = true
-}

third_party/blink/public/mojom/script/BUILD.gn

-# Copyright 2020 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//mojo/public/tools/bindings/mojom.gni")
-
-mojom_component("script") {
-  output_prefix = "blink_script_mojom"
-  macro_prefix = "BLINK_SCRIPT_MOJOM"
-
-  sources = [ "script_type.mojom" ]
-
-  # The Blink variant is linked directly into the private platform
-  # implementation and so it requires the corresponding export configuration to
-  # override the normal mojom_component() target exports.
-  export_class_attribute_blink = "PLATFORM_EXPORT"
-  export_define_blink = "BLINK_PLATFORM_IMPLEMENTATION=1"
-  export_header_blink = "third_party/blink/renderer/platform/platform_export.h"
-
-  generate_java = true
-}

third_party/blink/public/mojom/web_feature/BUILD.gn

-# Copyright 2020 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//mojo/public/tools/bindings/mojom.gni")
-
-mojom_component("web_feature") {
-  output_prefix = "blink_web_feature_mojom"
-  macro_prefix = "BLINK_WEB_FEATURE_MOJOM"
-
-  sources = [ "web_feature.mojom" ]
-
-  # The Blink variant is linked directly into the private platform
-  # implementation and so it requires the corresponding export configuration to
-  # override the normal mojom_component() target exports.
-  export_class_attribute_blink = "PLATFORM_EXPORT"
-  export_define_blink = "BLINK_PLATFORM_IMPLEMENTATION=1"
-  export_header_blink = "third_party/blink/renderer/platform/platform_export.h"
-
-  generate_java = true
-}