Remove mojo/common and all references to it

Bug: 799482 Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel;luci.chromium.try:linux_chromium_dbg_ng;master.tryserver.chromium.linux:linux_mojo;master.tryserver.chromium.linux:linux_vr Change-Id: I976a9290ef77976187ce971e461814a887620ee2 Reviewed-on: https://chromium-review.googlesource.com/1028000 Commit-Queue: Oksana Zhuravlova <oksamyt@chromium.org> Reviewed-by: Daniel Cheng <dcheng@chromium.org> Reviewed-by: Ken Rockot <rockot@chromium.org> Reviewed-by: Scott Violet <sky@chromium.org> Cr-Commit-Position: refs/heads/master@{#554518}
cbchan · Apr 27, 2018 · 58de35c · 58de35c
1 parent f9affb1
commit 58de35c
Show file tree

Hide file tree

Showing 94 changed files with 2 additions and 874 deletions.
diff --git a/ash/BUILD.gn b/ash/BUILD.gn
@@ -1177,7 +1177,6 @@ component("ash") {
     "//ash/strings",
     "//ash/wayland",
     "//mash/public/mojom",
-    "//mojo/common:values_struct_traits",
     "//mojo/public/cpp/system",
     "//services/ui/common:mus_common",
     "//services/ui/public/cpp",

diff --git a/ash/DEPS b/ash/DEPS
@@ -22,7 +22,6 @@ include_rules = [
   "+media",
   "+mash/public/mojom",
   "+mash/shelf/public",
-  "+mojo/common",
   "+mojo/public",
   "+services/catalog/public",
   "+services/preferences/public",

diff --git a/ash/components/autoclick/BUILD.gn b/ash/components/autoclick/BUILD.gn
@@ -19,7 +19,6 @@ source_set("lib") {
     "//ash/public/cpp",
     "//base",
     "//mash/public/mojom",
-    "//mojo/common",
     "//mojo/public/cpp/bindings",
     "//services/service_manager/public/cpp",
     "//services/ui/public/cpp",

diff --git a/ash/components/touch_hud/BUILD.gn b/ash/components/touch_hud/BUILD.gn
@@ -18,7 +18,6 @@ source_set("lib") {
     "//ash/touch_hud",
     "//base",
     "//mash/public/mojom",
-    "//mojo/common",
     "//mojo/public/cpp/bindings",
     "//services/service_manager/public/cpp",
     "//services/ui/public/cpp",

diff --git a/ash/login/ui/lock_contents_view.cc b/ash/login/ui/lock_contents_view.cc
@@ -36,7 +36,6 @@
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/user_manager/user_type.h"
-#include "mojo/common/values_struct_traits.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/display/display.h"

diff --git a/ash/login/ui/lock_debug_view.cc b/ash/login/ui/lock_debug_view.cc
@@ -21,7 +21,6 @@
 #include "ash/shell.h"
 #include "base/optional.h"
 #include "base/strings/utf_string_conversions.h"
-#include "mojo/common/values_struct_traits.h"
 #include "ui/base/ime/chromeos/ime_keyboard.h"
 #include "ui/views/controls/button/md_text_button.h"
 #include "ui/views/layout/box_layout.h"

diff --git a/ash/login/ui/login_expanded_public_account_view.cc b/ash/login/ui/login_expanded_public_account_view.cc
@@ -11,7 +11,6 @@
 #include "ash/shell.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "base/strings/utf_string_conversions.h"
-#include "mojo/common/values_struct_traits.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/paint_vector_icon.h"

diff --git a/ash/login/ui/login_user_view.cc b/ash/login/ui/login_user_view.cc
@@ -23,7 +23,6 @@
 #include "base/memory/weak_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/user_manager/user_type.h"
-#include "mojo/common/values_struct_traits.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/compositor/layer_animation_sequence.h"
 #include "ui/compositor/layer_animator.h"

diff --git a/ash/public/cpp/DEPS b/ash/public/cpp/DEPS
@@ -1,6 +1,5 @@
 include_rules = [
   "+components/prefs",
-  "+mojo/common",
   "+skia/public/interfaces",
   "+ui/display",
 ]
diff --git a/build/check_gn_headers_whitelist.txt b/build/check_gn_headers_whitelist.txt
@@ -186,7 +186,6 @@ media/formats/mpeg/adts_stream_parser.h
 media/formats/mpeg/mpeg1_audio_stream_parser.h
 media/formats/mpeg/mpeg_audio_stream_parser_base.h
 media/gpu/media_gpu_export.h
-mojo/common/mojo_common_export.h
 mojo/edk/system/broker_messages.h
 mojo/edk/system/system_impl_export.h
 mojo/public/cpp/bindings/strong_associated_binding_set.h

diff --git a/chrome/DEPS b/chrome/DEPS
@@ -26,7 +26,6 @@ include_rules = [
   "+content/public/common",
   "+content/public/test",
   "+media/media_buildflags.h",
-  "+mojo/common",
   "+mojo/public",
   "+ppapi/buildflags",
 

diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
@@ -1761,7 +1761,6 @@ jumbo_split_static_library("browser") {
     "//media/mojo/interfaces:mirror_service_remoting",
     "//media/mojo/interfaces:remoting",
     "//media/mojo/services",
-    "//mojo/common",
     "//mojo/edk",
     "//mojo/public/cpp/bindings",
     "//net:extras",

diff --git a/chrome/browser/chromeos/BUILD.gn b/chrome/browser/chromeos/BUILD.gn
@@ -162,7 +162,6 @@ source_set("chromeos") {
     "//mash/public/mojom",
     "//media",
     "//media/mojo/interfaces",
-    "//mojo/common",
     "//net",
     "//ppapi/proxy:ipc",  # For PpapiMsg_LoadPlugin
     "//services/data_decoder/public/cpp",

diff --git a/chrome/browser/vr/BUILD.gn b/chrome/browser/vr/BUILD.gn
@@ -310,7 +310,6 @@ test("vr_common_unittests") {
 
   deps = [
     ":vr_test_support",
-    "//mojo/common",
     "//mojo/public/cpp/bindings",
     "//testing/gmock",
     "//ui/gfx/geometry",

diff --git a/chromeos/services/device_sync/BUILD.gn b/chromeos/services/device_sync/BUILD.gn
@@ -86,7 +86,6 @@ source_set("unit_tests") {
     "//components/cryptauth:test_support",
     "//components/gcm_driver:test_support",
     "//components/prefs:test_support",
-    "//mojo/common",
     "//services/identity/public/cpp:test_support",
     "//services/service_manager/public/cpp:service_test_support",
     "//services/service_manager/public/cpp/test:test_support",

diff --git a/chromeos/services/device_sync/public/mojom/BUILD.gn b/chromeos/services/device_sync/public/mojom/BUILD.gn
@@ -27,7 +27,6 @@ source_set("unit_tests") {
     "//base",
     "//base/test:test_support",
     "//components/cryptauth",
-    "//mojo/common",
     "//mojo/public/cpp/test_support:test_utils",
     "//testing/gtest",
   ]

diff --git a/components/arc/common/bluetooth.mojom b/components/arc/common/bluetooth.mojom
@@ -278,8 +278,8 @@ struct BluetoothSdpAttribute {
   // change. This field is introduced between version 7 and 8, though
   // MinVersion is not annotated because of breaking change, too.
   // See details in the bug linked below.
-  // TODO(crbug.com/767313): Use mojo/common/values.mojom, when new libmojo
-  // (440057 or later) is rolled to ARC repository.
+  // TODO(crbug.com/767313): Use mojo/public/mojom/base/values.mojom, when new
+  // libmojo (440057 or later) is rolled to ARC repository.
   string? json_value@3;
 };
 

diff --git a/components/autofill/content/DEPS b/components/autofill/content/DEPS
@@ -1,6 +1,5 @@
 include_rules = [
   "+content/public/common",
-  "+mojo/common",
   "+mojo/public",
   "+services/service_manager/public/cpp",
 ]

diff --git a/components/mirroring/DEPS b/components/mirroring/DEPS
@@ -1,6 +1,5 @@
 include_rules = [
   "+media",
-  "+mojo/common",
   "+mojo/public",
 
   # For testing

diff --git a/components/password_manager/content/DEPS b/components/password_manager/content/DEPS
@@ -1,7 +1,6 @@
 include_rules = [
   "+components/autofill/core/common",
   "+content/public/common",
-  "+mojo/common",
   "+mojo/public",
   # Allow inclusion of WebKit API files.
   "+third_party/blink/public/platform",

diff --git a/components/printing/service/BUILD.gn b/components/printing/service/BUILD.gn
@@ -60,7 +60,6 @@ if (enable_basic_printing) {
       "//cc/paint:paint",
       "//components/crash/core/common:crash_key",
       "//components/printing/service/public/interfaces",
-      "//mojo/common",
       "//services/service_manager/public/cpp:service_test_support",
       "//skia",
       "//testing/gmock",

diff --git a/components/services/filesystem/BUILD.gn b/components/services/filesystem/BUILD.gn
@@ -27,7 +27,6 @@ static_library("lib") {
   deps = [
     "//base",
     "//components/services/filesystem/public/interfaces",
-    "//mojo/common",
     "//mojo/public/cpp/system",
     "//services/service_manager/public/cpp",
     "//services/service_manager/public/mojom",
@@ -48,7 +47,6 @@ if (!is_ios) {
       ":lib",
       "//base",
       "//components/services/filesystem/public/interfaces",
-      "//mojo/common",
       "//mojo/public/cpp/bindings",
       "//mojo/public/cpp/system",
       "//services/service_manager/public/cpp",
@@ -73,7 +71,6 @@ if (!is_ios) {
     deps = [
       "//base",
       "//components/services/filesystem/public/interfaces",
-      "//mojo/common",
       "//mojo/public/cpp/bindings",
       "//mojo/public/cpp/system",
       "//services/service_manager/public/cpp",

diff --git a/components/services/filesystem/DEPS b/components/services/filesystem/DEPS
@@ -1,6 +1,5 @@
 include_rules = [
   "+components/prefs",
-  "+mojo/common",
   "+mojo/public",
   "+mojo/util",
   "+services/service_manager",

diff --git a/components/services/font/DEPS b/components/services/font/DEPS
@@ -1,6 +1,5 @@
 include_rules = [
   "+services/service_manager",
-  "+mojo/common",
   "+mojo/public",
   "+skia",
   "+third_party/skia/include",

diff --git a/components/services/font/public/cpp/BUILD.gn b/components/services/font/public/cpp/BUILD.gn
@@ -15,7 +15,6 @@ source_set("cpp") {
   deps = [
     "../interfaces",
     "//base",
-    "//mojo/common",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/system",
     "//services/service_manager/public/cpp",

diff --git a/components/services/leveldb/BUILD.gn b/components/services/leveldb/BUILD.gn
@@ -27,7 +27,6 @@ static_library("lib") {
   ]
 
   deps = [
-    "//mojo/common",
     "//mojo/public/cpp/system",
     "//services/service_manager/public/cpp",
     "//third_party/leveldatabase",
@@ -44,7 +43,6 @@ service("leveldb") {
   deps = [
     ":lib",
     "//components/services/leveldb/public/interfaces",
-    "//mojo/common",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/system",
     "//services/service_manager/public/cpp",
@@ -70,7 +68,6 @@ service_test("leveldb_service_unittests") {
     "//components/services/filesystem/public/interfaces",
     "//components/services/leveldb/public/cpp",
     "//components/services/leveldb/public/interfaces",
-    "//mojo/common",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/system",
     "//services/service_manager/public/cpp",

diff --git a/components/services/leveldb/DEPS b/components/services/leveldb/DEPS
@@ -1,6 +1,5 @@
 include_rules = [
   "+components/services/filesystem/public/interfaces",
-  "+mojo/common",
   "+mojo/public",
   "+mojo/util",
   "+services/service_manager",

diff --git a/components/services/leveldb/public/cpp/BUILD.gn b/components/services/leveldb/public/cpp/BUILD.gn
@@ -13,7 +13,6 @@ static_library("cpp") {
   deps = [
     "//base",
     "//components/services/leveldb/public/interfaces",
-    "//mojo/common",
     "//services/service_manager/public/cpp",
     "//third_party/leveldatabase",
   ]

diff --git a/components/translate/content/common/DEPS b/components/translate/content/common/DEPS
diff --git a/content/DEPS b/content/DEPS
@@ -35,7 +35,6 @@ include_rules = [
   "+dbus",
   "+gpu",
   "+media",
-  "+mojo/common",
   "+mojo/edk/embedder",
   "+mojo/edk/js",
   "+mojo/message_pump",

diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
@@ -107,8 +107,6 @@ jumbo_source_set("browser") {
     "//media/mojo/interfaces",
     "//media/mojo/interfaces:constants",
     "//media/mojo/services",
-    "//mojo/common",
-    "//mojo/common:values_struct_traits",
     "//mojo/edk",
     "//mojo/public/cpp/bindings",
     "//mojo/public/js:resources",

diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc
@@ -51,7 +51,6 @@
 #include "content/public/common/url_constants.h"
 #include "content/public/common/url_utils.h"
 #include "content/public/common/web_preferences.h"
-#include "mojo/common/values_struct_traits.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"

diff --git a/content/browser/frame_host/navigation_request_info.cc b/content/browser/frame_host/navigation_request_info.cc
@@ -4,7 +4,6 @@
 
 #include "content/browser/frame_host/navigation_request_info.h"
 #include "content/common/service_worker/service_worker_types.h"
-#include "mojo/common/values_struct_traits.h"
 
 namespace content {
 

diff --git a/content/browser/loader/navigation_url_loader_network_service.cc b/content/browser/loader/navigation_url_loader_network_service.cc
@@ -56,7 +56,6 @@
 #include "content/public/common/url_utils.h"
 #include "content/public/common/weak_wrapper_shared_url_loader_factory.h"
 #include "content/public/common/webplugininfo.h"
-#include "mojo/common/values_struct_traits.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_content_disposition.h"
 #include "net/traffic_annotation/network_traffic_annotation.h"

diff --git a/content/browser/renderer_host/media/video_capture_host.cc b/content/browser/renderer_host/media/video_capture_host.cc
@@ -13,7 +13,6 @@
 #include "content/browser/renderer_host/media/video_capture_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
-#include "mojo/common/values_struct_traits.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 
 namespace content {

diff --git a/content/child/BUILD.gn b/content/child/BUILD.gn
@@ -106,7 +106,6 @@ target(link_target_type, "child") {
     "//gpu/command_buffer/client",
     "//media",
     "//media/blink",
-    "//mojo/common",
     "//mojo/edk",
     "//net",
     "//services/device/public/cpp:device_features",

diff --git a/content/public/common/BUILD.gn b/content/public/common/BUILD.gn
@@ -280,7 +280,6 @@ jumbo_source_set("common_sources") {
     # needed because of allow_circular_includes_from.
     "//content/common:mojo_bindings",
     "//media",
-    "//mojo/common",
     "//ppapi/buildflags",
     "//ppapi/c",
     "//services/network/public/cpp",

diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn
@@ -532,7 +532,6 @@ target(link_target_type, "renderer") {
     "//media/mojo/clients",
     "//media/mojo/interfaces",
     "//media/mojo/interfaces:remoting",
-    "//mojo/common",
     "//mojo/public/cpp/bindings",
     "//net",
     "//ppapi/buildflags",

diff --git a/content/renderer/mus/BUILD.gn b/content/renderer/mus/BUILD.gn
@@ -26,7 +26,6 @@ static_library("mus") {
     "//content/public/child:child_sources",
     "//content/public/common:common_sources",
     "//media/mojo/interfaces:remoting",
-    "//mojo/common",
     "//services/service_manager/public/cpp",
     "//services/ui/public/cpp",
     "//services/ui/public/interfaces",

diff --git a/content/utility/BUILD.gn b/content/utility/BUILD.gn
@@ -37,7 +37,6 @@ jumbo_source_set("utility") {
     "//content/public/child:child_sources",
     "//content/public/common:common_sources",
     "//media:media_buildflags",
-    "//mojo/common",
     "//mojo/public/cpp/bindings",
     "//net:net_with_v8",
     "//sandbox",

diff --git a/device/BUILD.gn b/device/BUILD.gn
@@ -109,7 +109,6 @@ test("device_unittests") {
     "//device/gamepad/public/mojom",
     "//device/gamepad/public/mojom:gamepad_mojom_traits_test",
     "//device/geolocation:unittests",
-    "//mojo/common",
     "//mojo/edk",
     "//mojo/public/cpp/bindings",
     "//net",

diff --git a/device/usb/mojo/BUILD.gn b/device/usb/mojo/BUILD.gn
@@ -19,7 +19,6 @@ source_set("mojo") {
     "//device/usb",
     "//device/usb/public/cpp",
     "//device/usb/public/mojom",
-    "//mojo/common",
     "//mojo/public/cpp/bindings",
     "//net",
   ]

diff --git a/device/usb/mojo/DEPS b/device/usb/mojo/DEPS
diff --git a/gpu/ipc/common/gpu_feature_info.typemap b/gpu/ipc/common/gpu_feature_info.typemap
@@ -7,7 +7,6 @@ public_headers = [ "//gpu/config/gpu_feature_info.h" ]
 traits_headers = [ "//gpu/ipc/common/gpu_feature_info_struct_traits.h" ]
 public_deps = [
   "//gpu/config",
-  "//mojo/common",
   "//ui/gfx/geometry/mojo",
 ]
 type_mappings = [

diff --git a/gpu/ipc/common/gpu_info.typemap b/gpu/ipc/common/gpu_info.typemap
@@ -10,7 +10,6 @@ sources = [
 ]
 public_deps = [
   "//gpu/config",
-  "//mojo/common",
   "//ui/gfx/geometry/mojo",
 ]
 type_mappings = [

diff --git a/mash/DEPS b/mash/DEPS
@@ -2,7 +2,6 @@ include_rules = [
   "+ash/public",
   "+components/prefs",
   "+components/viz/common",
-  "+mojo/common",
   "+mojo/converters",
   "+mojo/public",
   "+services/catalog/public",