BASELINE: Update Chromium to 78.0.3904.130

Change-Id: If185e0c0061b3437531c97c9c8c78f239352a68b
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

45 files changed, 120 insertions, 318 deletions

diff --git a/chromium/chrome/services/app_service/public/mojom/BUILD.gn b/chromium/chrome/services/app_service/public/mojom/BUILD.gn
index 81e5f58a85e..e2a080ba170 100644
--- a/chromium/chrome/services/app_service/public/mojom/BUILD.gn
+++ b/chromium/chrome/services/app_service/public/mojom/BUILD.gn
@@ -28,6 +28,6 @@ mojom("types") {
 
   public_deps = [
     "//mojo/public/mojom/base",
-    "//ui/gfx/image/mojo:interfaces",
+    "//ui/gfx/image/mojom",
   ]
 }
diff --git a/chromium/chrome/services/app_service/public/mojom/types.mojom b/chromium/chrome/services/app_service/public/mojom/types.mojom
index 0ac07566d03..e292ea64c34 100644
--- a/chromium/chrome/services/app_service/public/mojom/types.mojom
+++ b/chromium/chrome/services/app_service/public/mojom/types.mojom
@@ -5,7 +5,7 @@
 module apps.mojom;
 
 import "mojo/public/mojom/base/time.mojom";
-import "ui/gfx/image/mojo/image.mojom";
+import "ui/gfx/image/mojom/image.mojom";
 
 // Information about an app. See chrome/services/app_service/README.md.
 struct App {
@@ -155,7 +155,6 @@ enum LaunchSource {
   kFromAppListQuery,             // Query-dependent results (larger icons).
   kFromAppListQueryContextMenu,  // Query-dependent results; context menu.
   kFromAppListRecommendation,    // Query-less recommendations (smaller icons).
-  kFromKioskNextHome,            // Kiosk Next Home app.
   kFromParentalControls,         // Parental Controls Settings Section.
 };
 
diff --git a/chromium/chrome/services/cups_ipp_parser/public/mojom/constants.mojom b/chromium/chrome/services/cups_ipp_parser/public/mojom/constants.mojom
deleted file mode 100644
index 1e41ed9f23c..00000000000
--- a/chromium/chrome/services/cups_ipp_parser/public/mojom/constants.mojom
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2018 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.
-
-module cups_ipp_parser.mojom;
-
-const string kCupsIppParserServiceName = "cups_ipp_parser";
diff --git a/chromium/chrome/services/cups_proxy/BUILD.gn b/chromium/chrome/services/cups_proxy/BUILD.gn
index f163e545d1c..5d45be49378 100644
--- a/chromium/chrome/services/cups_proxy/BUILD.gn
+++ b/chromium/chrome/services/cups_proxy/BUILD.gn
@@ -22,8 +22,6 @@ source_set("cups_proxy") {
     "//chrome/services/cups_proxy/public/mojom",
     "//chromeos/dbus",
     "//net",
-    "//services/service_manager/public/cpp",
-    "//services/service_manager/public/mojom",
   ]
 
   # We stub this service if libCUPS is not present.
diff --git a/chromium/chrome/services/cups_proxy/public/cpp/BUILD.gn b/chromium/chrome/services/cups_proxy/public/cpp/BUILD.gn
index ac042cf3733..9394f64227a 100644
--- a/chromium/chrome/services/cups_proxy/public/cpp/BUILD.gn
+++ b/chromium/chrome/services/cups_proxy/public/cpp/BUILD.gn
@@ -26,7 +26,7 @@ source_set("cpp") {
       "ipp_messages.h",
     ]
     public_deps = [
-      "//chrome/services/cups_ipp_parser/public/cpp",
+      "//chrome/services/ipp_parser/public/cpp",
       "//printing",
     ]
   }
@@ -35,26 +35,15 @@ source_set("cpp") {
 source_set("unit_tests") {
   testonly = true
 
-  sources = [
-    "cups_util_unittest.cc",
-  ]
-  deps = [
-    ":cpp",
-    "//base",
-    "//testing/gmock",
-    "//testing/gtest",
-  ]
-}
-
-source_set("manifest") {
-  sources = [
-    "manifest.cc",
-    "manifest.h",
-  ]
-
-  deps = [
-    "//base",
-    "//chrome/services/cups_proxy/public/mojom",
-    "//services/service_manager/public/cpp",
-  ]
+  if (use_cups) {
+    sources = [
+      "cups_util_unittest.cc",
+    ]
+    deps = [
+      ":cpp",
+      "//base",
+      "//testing/gmock",
+      "//testing/gtest",
+    ]
+  }
 }
diff --git a/chromium/chrome/services/cups_proxy/public/mojom/BUILD.gn b/chromium/chrome/services/cups_proxy/public/mojom/BUILD.gn
index 87e00bc869a..5df08c857f7 100644
--- a/chromium/chrome/services/cups_proxy/public/mojom/BUILD.gn
+++ b/chromium/chrome/services/cups_proxy/public/mojom/BUILD.gn
@@ -7,7 +7,6 @@ import("//mojo/public/tools/bindings/mojom.gni")
 
 mojom("mojom") {
   sources = [
-    "constants.mojom",
     "proxy.mojom",
   ]
 
diff --git a/chromium/chrome/services/cups_proxy/public/mojom/constants.mojom b/chromium/chrome/services/cups_proxy/public/mojom/constants.mojom
deleted file mode 100644
index 3833df859da..00000000000
--- a/chromium/chrome/services/cups_proxy/public/mojom/constants.mojom
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2019 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.
-
-module chromeos.printing.mojom;
-
-// Service id.
-const string kCupsProxyServiceName = "cups_proxy";
-
-// StartCupsProxyService capability id.
-const string kStartCupsProxyServiceCapability = "start_cups_proxy_service";
diff --git a/chromium/chrome/services/cups_proxy/public/mojom/proxy.mojom b/chromium/chrome/services/cups_proxy/public/mojom/proxy.mojom
index 28086c32151..24129b6b802 100644
--- a/chromium/chrome/services/cups_proxy/public/mojom/proxy.mojom
+++ b/chromium/chrome/services/cups_proxy/public/mojom/proxy.mojom
@@ -7,13 +7,4 @@
 
 module chromeos.printing.mojom;
 
-// The CupsProxyService's should lazily start once the CupsProxyDaemon has
-// started; since the ChromeOS daemon cannot directly connect to the service,
-// the browser must start it. Currently the only way to start a service is by
-// connecting to its interface, so we explicitly define an interface for this
-// purpose.
-// Note: This service both manages its own lifetime and bootstraps its own
-// connection with the daemon, i.e. it rejects any interface requests besides
-// this one.
-interface StartCupsProxyService {
-};
+// TODO(crbug.com/945409): Add proxy method.
diff --git a/chromium/chrome/services/file_util/BUILD.gn b/chromium/chrome/services/file_util/BUILD.gn
index 1c1f05e8bcc..a8e5c994cd8 100644
--- a/chromium/chrome/services/file_util/BUILD.gn
+++ b/chromium/chrome/services/file_util/BUILD.gn
@@ -3,8 +3,9 @@
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
+import("//components/safe_browsing/buildflags.gni")
 
-source_set("lib") {
+source_set("file_util") {
   sources = [
     "file_util_service.cc",
     "file_util_service.h",
@@ -12,13 +13,14 @@ source_set("lib") {
 
   deps = [
     "//base",
+    "//components/safe_browsing:buildflags",
     "//mojo/public/cpp/bindings",
   ]
 
   public_deps = [
     "//chrome/services/file_util/public/mojom",
+    "//mojo/public/cpp/bindings",
     "//mojo/public/mojom/base",
-    "//services/service_manager/public/cpp",
   ]
 
   if (is_chromeos) {
diff --git a/chromium/chrome/services/file_util/public/cpp/BUILD.gn b/chromium/chrome/services/file_util/public/cpp/BUILD.gn
index ff8c744f397..7c7aff42680 100644
--- a/chromium/chrome/services/file_util/public/cpp/BUILD.gn
+++ b/chromium/chrome/services/file_util/public/cpp/BUILD.gn
@@ -3,11 +3,11 @@
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
+import("//components/safe_browsing/buildflags.gni")
 
 source_set("cpp") {
   public_deps = [
     "//chrome/services/file_util/public/mojom",
-    "//services/service_manager/public/cpp",
   ]
 
   if (safe_browsing_mode == 1) {
@@ -30,20 +30,6 @@ source_set("cpp") {
   }
 }
 
-source_set("manifest") {
-  sources = [
-    "manifest.cc",
-    "manifest.h",
-  ]
-
-  deps = [
-    "//base",
-    "//chrome:strings",
-    "//chrome/services/file_util/public/mojom",
-    "//services/service_manager/public/cpp",
-  ]
-}
-
 if (safe_browsing_mode == 1) {
   source_set("unit_tests") {
     testonly = true
@@ -56,9 +42,8 @@ if (safe_browsing_mode == 1) {
 
     deps = [
       ":cpp",
-      "//chrome/services/file_util:lib",
+      "//chrome/services/file_util",
       "//crypto:platform",
-      "//services/service_manager/public/cpp/test:test_support",
       "//skia",
       "//testing/gmock",
       "//testing/gtest",
@@ -78,6 +63,7 @@ if (is_chromeos) {
     deps = [
       "//base",
       "//chrome/test:test_support",
+      "//content/public/browser",
       "//content/public/common",
       "//content/test:test_support",
       "//testing/gtest",
diff --git a/chromium/chrome/services/file_util/public/mojom/BUILD.gn b/chromium/chrome/services/file_util/public/mojom/BUILD.gn
index 260715c516a..10d8410c409 100644
--- a/chromium/chrome/services/file_util/public/mojom/BUILD.gn
+++ b/chromium/chrome/services/file_util/public/mojom/BUILD.gn
@@ -2,16 +2,18 @@
 # 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")
 import("//build/config/features.gni")
+import("//components/safe_browsing/buildflags.gni")
+import("//mojo/public/tools/bindings/mojom.gni")
 
 mojom("mojom") {
   sources = [
-    "constants.mojom",
+    "file_util_service.mojom",
   ]
 
   if (safe_browsing_mode == 1) {
     sources += [ "safe_archive_analyzer.mojom" ]
+    enabled_features = [ "full_safe_browsing" ]
   }
 
   public_deps = [
diff --git a/chromium/chrome/services/file_util/public/mojom/constants.mojom b/chromium/chrome/services/file_util/public/mojom/constants.mojom
deleted file mode 100644
index cf32245f620..00000000000
--- a/chromium/chrome/services/file_util/public/mojom/constants.mojom
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2017 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.
-
-module chrome.mojom;
-
-const string kFileUtilServiceName = "file_util";
diff --git a/chromium/chrome/services/file_util/public/mojom/file_util_service.mojom b/chromium/chrome/services/file_util/public/mojom/file_util_service.mojom
new file mode 100644
index 00000000000..e10f5db87ce
--- /dev/null
+++ b/chromium/chrome/services/file_util/public/mojom/file_util_service.mojom
@@ -0,0 +1,23 @@
+// Copyright 2019 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.
+
+module chrome.mojom;
+
+[EnableIf=full_safe_browsing]
+import "chrome/services/file_util/public/mojom/safe_archive_analyzer.mojom";
+
+[EnableIf=is_chromeos]
+import "chrome/services/file_util/public/mojom/zip_file_creator.mojom";
+
+// The main interface to the file utility service. Binds any of various
+// specific utility receivers.
+interface FileUtilService {
+  // Binds an instance of the ZipFileCreator interface.
+  [EnableIf=is_chromeos]
+  BindZipFileCreator(pending_receiver<ZipFileCreator> receiver);
+
+  // Binds an instance of the SafeArchiveAnalyzer interface.
+  [EnableIf=full_safe_browsing]
+  BindSafeArchiveAnalyzer(pending_receiver<SafeArchiveAnalyzer> receiver);
+};
diff --git a/chromium/chrome/services/file_util/public/mojom/safe_archive_analyzer.typemap b/chromium/chrome/services/file_util/public/mojom/safe_archive_analyzer.typemap
index 3f1c04e8fff..c5207d3712f 100644
--- a/chromium/chrome/services/file_util/public/mojom/safe_archive_analyzer.typemap
+++ b/chromium/chrome/services/file_util/public/mojom/safe_archive_analyzer.typemap
@@ -10,7 +10,8 @@ traits_headers = [ "//chrome/services/file_util/public/mojom/safe_archive_analyz
 
 public_deps = [
   "//chrome/common/safe_browsing:proto",
+  "//components/safe_browsing:buildflags",
   "//components/safe_browsing:csd_proto",
 ]
 
-type_mappings = [ "chrome.mojom.SafeArchiveAnalyzerResults=safe_browsing::ArchiveAnalyzerResults" ]
+type_mappings = [ "chrome.mojom.SafeArchiveAnalyzerResults=::safe_browsing::ArchiveAnalyzerResults" ]
diff --git a/chromium/chrome/services/file_util/public/mojom/zip_file_creator.mojom b/chromium/chrome/services/file_util/public/mojom/zip_file_creator.mojom
index 92017e24884..5b4511ec35f 100644
--- a/chromium/chrome/services/file_util/public/mojom/zip_file_creator.mojom
+++ b/chromium/chrome/services/file_util/public/mojom/zip_file_creator.mojom
@@ -13,7 +13,7 @@ import "mojo/public/mojom/base/file_path.mojom";
 
 interface ZipFileCreator {
   // OS_CHROMEOS: Create a |zip_file| from a list of source files.
-  CreateZipFile(filesystem.mojom.Directory source_dir_mojo,
+  CreateZipFile(pending_remote<filesystem.mojom.Directory> source_dir_mojo,
                 mojo_base.mojom.FilePath source_dir,
                 array<mojo_base.mojom.FilePath> source_relative_paths,
                 mojo_base.mojom.File zip_file)
diff --git a/chromium/chrome/services/cups_ipp_parser/BUILD.gn b/chromium/chrome/services/ipp_parser/BUILD.gn
index c390c5b79d0..fa304ecbf35 100644
--- a/chromium/chrome/services/cups_ipp_parser/BUILD.gn
+++ b/chromium/chrome/services/ipp_parser/BUILD.gn
@@ -7,32 +7,32 @@ import("//printing/buildflags/buildflags.gni")
 
 enable_service = use_cups && is_chromeos
 
-source_set("cups_ipp_parser") {
+source_set("ipp_parser") {
   sources = [
-    "cups_ipp_parser_service.cc",
-    "cups_ipp_parser_service.h",
     "ipp_parser.h",
+    "ipp_parser_service.cc",
+    "ipp_parser_service.h",
   ]
 
   deps = [
     "//base",
+    "//chrome:strings",
     "//chrome/services/cups_proxy/public/cpp",
     "//mojo/public/cpp/bindings",
     "//net",
   ]
 
   public_deps = [
-    "//chrome/services/cups_ipp_parser/public/mojom",
+    "//chrome/services/ipp_parser/public/mojom",
     "//mojo/public/mojom/base",
     "//printing",
-    "//services/service_manager/public/cpp",
   ]
 
   # We stub the implementation if libCUPS is not present.
   if (enable_service) {
     configs += [ "//printing:cups" ]
     sources += [ "ipp_parser.cc" ]
-    deps += [ "//chrome/services/cups_ipp_parser/public/cpp" ]
+    deps += [ "//chrome/services/ipp_parser/public/cpp" ]
   } else {
     sources += [ "fake_ipp_parser.cc" ]
   }
diff --git a/chromium/chrome/services/cups_ipp_parser/public/cpp/BUILD.gn b/chromium/chrome/services/ipp_parser/public/cpp/BUILD.gn
index 73c3663184d..aa72f714008 100644
--- a/chromium/chrome/services/cups_ipp_parser/public/cpp/BUILD.gn
+++ b/chromium/chrome/services/ipp_parser/public/cpp/BUILD.gn
@@ -13,7 +13,7 @@ if (use_cups) {
     ]
 
     public_deps = [
-      "//chrome/services/cups_ipp_parser/public/mojom",
+      "//chrome/services/ipp_parser/public/mojom",
     ]
 
     deps = [
@@ -41,22 +41,6 @@ if (use_cups) {
   }
 }
 
-if (is_chromeos) {
-  source_set("manifest") {
-    sources = [
-      "manifest.cc",
-      "manifest.h",
-    ]
-
-    deps = [
-      "//base",
-      "//chrome:strings",
-      "//chrome/services/cups_ipp_parser/public/mojom",
-      "//services/service_manager/public/cpp",
-    ]
-  }
-}
-
 # A dummy group to make fuzz targets discoverable.
 group("fuzzers") {
 }
diff --git a/chromium/chrome/services/cups_ipp_parser/public/mojom/BUILD.gn b/chromium/chrome/services/ipp_parser/public/mojom/BUILD.gn
index b36a1fa9a32..426c63ca723 100644
--- a/chromium/chrome/services/cups_ipp_parser/public/mojom/BUILD.gn
+++ b/chromium/chrome/services/ipp_parser/public/mojom/BUILD.gn
@@ -7,7 +7,6 @@ import("//mojo/public/tools/bindings/mojom.gni")
 
 mojom("mojom") {
   sources = [
-    "constants.mojom",
     "ipp_parser.mojom",
   ]
 
diff --git a/chromium/chrome/services/cups_ipp_parser/public/mojom/ipp_parser.mojom b/chromium/chrome/services/ipp_parser/public/mojom/ipp_parser.mojom
index 584617d19ed..b523e789096 100644
--- a/chromium/chrome/services/cups_ipp_parser/public/mojom/ipp_parser.mojom
+++ b/chromium/chrome/services/ipp_parser/public/mojom/ipp_parser.mojom
@@ -6,7 +6,7 @@
 // request, IppRequest, and an interface for parsing arbitrary requests into
 // this format, IppParser.
 
-module cups_ipp_parser.mojom;
+module ipp_parser.mojom;
 
 [Extensible]
 enum ValueType {
diff --git a/chromium/chrome/services/isolated_xr_device/BUILD.gn b/chromium/chrome/services/isolated_xr_device/BUILD.gn
index 0474d93a2b0..5e3335eeac3 100644
--- a/chromium/chrome/services/isolated_xr_device/BUILD.gn
+++ b/chromium/chrome/services/isolated_xr_device/BUILD.gn
@@ -2,6 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//device/vr/buildflags/buildflags.gni")
+
 source_set("lib") {
   sources = [
     "xr_device_service.cc",
@@ -14,28 +16,15 @@ source_set("lib") {
     "xr_test_hook_wrapper.h",
   ]
 
+  if (enable_openxr) {
+    configs += [ "//third_party/openxr:config" ]
+  }
+
   deps = [
     "//base",
     "//chrome/common",
     "//device/vr:vr",
     "//device/vr/public/mojom",
     "//device/vr/public/mojom:test_mojom",
-    "//services/service_manager/public/cpp",
-    "//services/service_manager/public/mojom",
-  ]
-}
-
-source_set("manifest") {
-  sources = [
-    "manifest.cc",
-    "manifest.h",
-  ]
-
-  deps = [
-    "//base",
-    "//chrome:strings",
-    "//device/vr/public/mojom",
-    "//device/vr/public/mojom:test_mojom",
-    "//services/service_manager/public/cpp",
   ]
 }
diff --git a/chromium/chrome/services/media_gallery_util/BUILD.gn b/chromium/chrome/services/media_gallery_util/BUILD.gn
index 47a9aa14725..a8afac8d090 100644
--- a/chromium/chrome/services/media_gallery_util/BUILD.gn
+++ b/chromium/chrome/services/media_gallery_util/BUILD.gn
@@ -8,8 +8,6 @@ source_set("lib") {
   sources = [
     "ipc_data_source.cc",
     "ipc_data_source.h",
-    "media_gallery_util_service.cc",
-    "media_gallery_util_service.h",
     "media_metadata_parser.cc",
     "media_metadata_parser.h",
     "media_parser.cc",
@@ -35,7 +33,6 @@ source_set("lib") {
 
   public_deps = [
     "//chrome/services/media_gallery_util/public/mojom",
-    "//services/service_manager/public/cpp",
   ]
 
   if (media_use_ffmpeg) {
diff --git a/chromium/chrome/services/media_gallery_util/public/cpp/BUILD.gn b/chromium/chrome/services/media_gallery_util/public/cpp/BUILD.gn
index 367672c7827..2cfc0315279 100644
--- a/chromium/chrome/services/media_gallery_util/public/cpp/BUILD.gn
+++ b/chromium/chrome/services/media_gallery_util/public/cpp/BUILD.gn
@@ -15,9 +15,10 @@ source_set("cpp") {
   ]
 
   deps = [
+    "//chrome/app:generated_resources",
+    "//content/public/browser",
     "//media:media_buildflags",
     "//net:buildflags",
-    "//services/service_manager/public/cpp",
     "//third_party/boringssl",
     "//third_party/libyuv",
   ]
@@ -34,20 +35,6 @@ source_set("cpp") {
   }
 }
 
-source_set("manifest") {
-  sources = [
-    "manifest.cc",
-    "manifest.h",
-  ]
-
-  deps = [
-    "//base",
-    "//chrome:strings",
-    "//chrome/services/media_gallery_util/public/mojom",
-    "//services/service_manager/public/cpp",
-  ]
-}
-
 source_set("browser_tests") {
   testonly = true
 
diff --git a/chromium/chrome/services/media_gallery_util/public/mojom/BUILD.gn b/chromium/chrome/services/media_gallery_util/public/mojom/BUILD.gn
index 71c403e49c9..93a0c9000d1 100644
--- a/chromium/chrome/services/media_gallery_util/public/mojom/BUILD.gn
+++ b/chromium/chrome/services/media_gallery_util/public/mojom/BUILD.gn
@@ -6,12 +6,11 @@ import("//mojo/public/tools/bindings/mojom.gni")
 
 mojom("mojom") {
   sources = [
-    "constants.mojom",
     "media_parser.mojom",
   ]
 
   public_deps = [
-    "//media/mojo/interfaces",
+    "//media/mojo/mojom",
     "//mojo/public/mojom/base",
   ]
 }
diff --git a/chromium/chrome/services/media_gallery_util/public/mojom/constants.mojom b/chromium/chrome/services/media_gallery_util/public/mojom/constants.mojom
deleted file mode 100644
index 4b4963598df..00000000000
--- a/chromium/chrome/services/media_gallery_util/public/mojom/constants.mojom
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2017 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.
-
-module chrome.mojom;
-
-const string kMediaGalleryUtilServiceName = "media_gallery_util";
diff --git a/chromium/chrome/services/media_gallery_util/public/mojom/media_parser.mojom b/chromium/chrome/services/media_gallery_util/public/mojom/media_parser.mojom
index 4ac236e8952..2449a84d471 100644
--- a/chromium/chrome/services/media_gallery_util/public/mojom/media_parser.mojom
+++ b/chromium/chrome/services/media_gallery_util/public/mojom/media_parser.mojom
@@ -4,7 +4,7 @@
 
 module chrome.mojom;
 
-import "media/mojo/interfaces/media_types.mojom";
+import "media/mojo/mojom/media_types.mojom";
 import "mojo/public/mojom/base/file.mojom";
 import "mojo/public/mojom/base/time.mojom";
 import "mojo/public/mojom/base/values.mojom";
@@ -24,7 +24,7 @@ interface MediaParser {
   ParseMediaMetadata(string mime_type,
                      int64 total_size,
                      bool get_attached_images,
-                     MediaDataSource media_data_source)
+                     pending_remote<MediaDataSource> media_data_source)
       => (bool parse_success,
           MediaMetadata metadata,
           array<AttachedImage> attached_images);
@@ -35,7 +35,7 @@ interface MediaParser {
   [EnableIf=is_android]
   ExtractVideoFrame(string mime_type,
                     uint32 total_size,
-                    MediaDataSource media_data_source)
+                    pending_remote<MediaDataSource> media_data_source)
       => (bool success,
           VideoFrameData frame_data,
           media.mojom.VideoDecoderConfig? config);
@@ -62,7 +62,7 @@ interface MediaParserFactory {
   // for instance) and the media parser may be run in a sandboxed process with
   // no such access.
   CreateMediaParser(int64 libyuv_cpu_flags, int64 libavutil_cpu_flags)
-      => (MediaParser media_parser);
+      => (pending_remote<MediaParser> media_parser);
 };
 
 interface MediaDataSource {
diff --git a/chromium/chrome/services/printing/BUILD.gn b/chromium/chrome/services/printing/BUILD.gn
index c6f601d8eca..4c33867b256 100644
--- a/chromium/chrome/services/printing/BUILD.gn
+++ b/chromium/chrome/services/printing/BUILD.gn
@@ -13,15 +13,14 @@ source_set("lib") {
   ]
 
   deps = [
-    "//base",
     "//components/crash/core/common:crash_key",
     "//components/pwg_encoder",
-    "//mojo/public/cpp/bindings",
   ]
 
   public_deps = [
+    "//base",
     "//chrome/services/printing/public/mojom",
-    "//services/service_manager/public/cpp",
+    "//mojo/public/cpp/bindings",
   ]
 
   if (is_win) {
diff --git a/chromium/chrome/services/printing/public/cpp/BUILD.gn b/chromium/chrome/services/printing/public/cpp/BUILD.gn
deleted file mode 100644
index 281696c4a53..00000000000
--- a/chromium/chrome/services/printing/public/cpp/BUILD.gn
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2019 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.
-
-source_set("manifest") {
-  sources = [
-    "manifest.cc",
-    "manifest.h",
-  ]
-
-  deps = [
-    "//base",
-    "//chrome:strings",
-    "//chrome/services/printing/public/mojom",
-    "//services/service_manager/public/cpp",
-  ]
-}
diff --git a/chromium/chrome/services/printing/public/mojom/BUILD.gn b/chromium/chrome/services/printing/public/mojom/BUILD.gn
index 2eba7afb8ae..191f257e225 100644
--- a/chromium/chrome/services/printing/public/mojom/BUILD.gn
+++ b/chromium/chrome/services/printing/public/mojom/BUILD.gn
@@ -6,14 +6,14 @@ import("//mojo/public/tools/bindings/mojom.gni")
 
 mojom("mojom") {
   sources = [
-    "constants.mojom",
     "pdf_nup_converter.mojom",
     "pdf_render_settings.mojom",
     "pdf_to_pwg_raster_converter.mojom",
+    "printing_service.mojom",
   ]
 
   deps = [
-    "//ui/gfx/geometry/mojo",
+    "//ui/gfx/geometry/mojom",
   ]
 
   public_deps = [
diff --git a/chromium/chrome/services/printing/public/mojom/constants.mojom b/chromium/chrome/services/printing/public/mojom/constants.mojom
deleted file mode 100644
index ab49398b5b6..00000000000
--- a/chromium/chrome/services/printing/public/mojom/constants.mojom
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2017 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.
-
-module printing.mojom;
-
-const string kChromePrintingServiceName = "chrome_printing";
diff --git a/chromium/chrome/services/printing/public/mojom/pdf_nup_converter.mojom b/chromium/chrome/services/printing/public/mojom/pdf_nup_converter.mojom
index 1b6dcce6bcc..9dd5eb782ed 100644
--- a/chromium/chrome/services/printing/public/mojom/pdf_nup_converter.mojom
+++ b/chromium/chrome/services/printing/public/mojom/pdf_nup_converter.mojom
@@ -5,7 +5,7 @@
 module printing.mojom;
 
 import "mojo/public/mojom/base/shared_memory.mojom";
-import "ui/gfx/geometry/mojo/geometry.mojom";
+import "ui/gfx/geometry/mojom/geometry.mojom";
 import "url/mojom/url.mojom";
 
 // This set of interfaces is used to do Nup PDF conversion.
diff --git a/chromium/chrome/services/printing/public/mojom/pdf_render_settings.mojom b/chromium/chrome/services/printing/public/mojom/pdf_render_settings.mojom
index b74b5bb7b4b..518a3687d03 100644
--- a/chromium/chrome/services/printing/public/mojom/pdf_render_settings.mojom
+++ b/chromium/chrome/services/printing/public/mojom/pdf_render_settings.mojom
@@ -4,7 +4,7 @@
 
 module printing.mojom;
 
-import "ui/gfx/geometry/mojo/geometry.mojom";
+import "ui/gfx/geometry/mojom/geometry.mojom";
 
 struct PdfRenderSettings {
   enum Mode {
diff --git a/chromium/chrome/services/printing/public/mojom/pdf_render_settings.typemap b/chromium/chrome/services/printing/public/mojom/pdf_render_settings.typemap
index 92721cda2ff..76cd87a4b73 100644
--- a/chromium/chrome/services/printing/public/mojom/pdf_render_settings.typemap
+++ b/chromium/chrome/services/printing/public/mojom/pdf_render_settings.typemap
@@ -18,6 +18,6 @@ public_deps = [
 ]
 
 type_mappings = [
-  "printing.mojom.PdfRenderSettings=printing::PdfRenderSettings",
-  "printing.mojom.PdfRenderSettings::Mode=printing::PdfRenderSettings::Mode",
+  "printing.mojom.PdfRenderSettings=::printing::PdfRenderSettings",
+  "printing.mojom.PdfRenderSettings::Mode=::printing::PdfRenderSettings::Mode",
 ]
diff --git a/chromium/chrome/services/printing/public/mojom/pdf_to_pwg_raster_converter.typemap b/chromium/chrome/services/printing/public/mojom/pdf_to_pwg_raster_converter.typemap
index d10073ab630..561d8410765 100644
--- a/chromium/chrome/services/printing/public/mojom/pdf_to_pwg_raster_converter.typemap
+++ b/chromium/chrome/services/printing/public/mojom/pdf_to_pwg_raster_converter.typemap
@@ -12,6 +12,6 @@ sources = [
 public_deps = []
 
 type_mappings = [
-  "printing.mojom.PwgRasterTransformType=printing::PwgRasterTransformType",
-  "printing.mojom.PwgRasterSettings=printing::PwgRasterSettings",
+  "printing.mojom.PwgRasterTransformType=::printing::PwgRasterTransformType",
+  "printing.mojom.PwgRasterSettings=::printing::PwgRasterSettings",
 ]
diff --git a/chromium/chrome/services/printing/public/mojom/printing_service.mojom b/chromium/chrome/services/printing/public/mojom/printing_service.mojom
new file mode 100644
index 00000000000..f92dc002b42
--- /dev/null
+++ b/chromium/chrome/services/printing/public/mojom/printing_service.mojom
@@ -0,0 +1,28 @@
+// Copyright 2019 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.
+
+module printing.mojom;
+
+import "chrome/services/printing/public/mojom/pdf_nup_converter.mojom";
+import "chrome/services/printing/public/mojom/pdf_to_pwg_raster_converter.mojom";
+
+[EnableIf=is_win]
+import "chrome/services/printing/public/mojom/pdf_to_emf_converter.mojom";
+
+// The main interface to Chrome's Printing Service, which performs various PDF
+// conversion operations in an isolated sandboxed process.
+interface PrintingService {
+  // Binds an interface that can be used to do Nup PDF conversion.
+  BindPdfNupConverter(pending_receiver<PdfNupConverter> receiver);
+
+  // Binds an interface that can be used to do PDF to PWG Raster conversion.
+  BindPdfToPwgRasterConverter(
+      pending_receiver<PdfToPwgRasterConverter> receiver);
+
+  // Binds an interface that can be used to do PDF to EMF conversion. Windows
+  // only.
+  [EnableIf=is_win]
+  BindPdfToEmfConverterFactory(
+      pending_receiver<PdfToEmfConverterFactory> receiver);
+};
diff --git a/chromium/chrome/services/removable_storage_writer/BUILD.gn b/chromium/chrome/services/removable_storage_writer/BUILD.gn
index 07729f63a76..0f5a386420e 100644
--- a/chromium/chrome/services/removable_storage_writer/BUILD.gn
+++ b/chromium/chrome/services/removable_storage_writer/BUILD.gn
@@ -6,17 +6,11 @@ source_set("lib") {
   sources = [
     "removable_storage_writer.cc",
     "removable_storage_writer.h",
-    "removable_storage_writer_service.cc",
-    "removable_storage_writer_service.h",
-  ]
-
-  deps = [
-    "//base",
-    "//mojo/public/cpp/bindings",
   ]
 
   public_deps = [
+    "//base",
     "//chrome/services/removable_storage_writer/public/mojom",
-    "//services/service_manager/public/cpp",
+    "//mojo/public/cpp/bindings",
   ]
 }
diff --git a/chromium/chrome/services/removable_storage_writer/public/cpp/BUILD.gn b/chromium/chrome/services/removable_storage_writer/public/cpp/BUILD.gn
deleted file mode 100644
index 2d402f00feb..00000000000
--- a/chromium/chrome/services/removable_storage_writer/public/cpp/BUILD.gn
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2019 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.
-
-source_set("manifest") {
-  sources = [
-    "manifest.cc",
-    "manifest.h",
-  ]
-
-  deps = [
-    "//base",
-    "//chrome:strings",
-    "//chrome/services/removable_storage_writer/public/mojom",
-    "//services/service_manager/public/cpp",
-  ]
-}
diff --git a/chromium/chrome/services/removable_storage_writer/public/mojom/BUILD.gn b/chromium/chrome/services/removable_storage_writer/public/mojom/BUILD.gn
index 15c70475a4f..e0659789bfb 100644
--- a/chromium/chrome/services/removable_storage_writer/public/mojom/BUILD.gn
+++ b/chromium/chrome/services/removable_storage_writer/public/mojom/BUILD.gn
@@ -6,7 +6,6 @@ import("//mojo/public/tools/bindings/mojom.gni")
 
 mojom("mojom") {
   sources = [
-    "constants.mojom",
     "removable_storage_writer.mojom",
   ]
 
diff --git a/chromium/chrome/services/removable_storage_writer/public/mojom/constants.mojom b/chromium/chrome/services/removable_storage_writer/public/mojom/constants.mojom
deleted file mode 100644
index b18fbe74af7..00000000000
--- a/chromium/chrome/services/removable_storage_writer/public/mojom/constants.mojom
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2017 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.
-
-module chrome.mojom;
-
-const string kRemovableStorageWriterServiceName = "removable_storage_writer";
diff --git a/chromium/chrome/services/removable_storage_writer/public/mojom/removable_storage_writer.mojom b/chromium/chrome/services/removable_storage_writer/public/mojom/removable_storage_writer.mojom
index a031d274756..ddf706266e3 100644
--- a/chromium/chrome/services/removable_storage_writer/public/mojom/removable_storage_writer.mojom
+++ b/chromium/chrome/services/removable_storage_writer/public/mojom/removable_storage_writer.mojom
@@ -13,14 +13,14 @@ interface RemovableStorageWriter {
   // restricted to removable drives by the utility process.
   Write(mojo_base.mojom.FilePath source,
         mojo_base.mojom.FilePath target,
-        RemovableStorageWriterClient client);
+        pending_remote<RemovableStorageWriterClient> client);
 
   // Verifies that the contents of the source file was written to the target
   // file. Again, the target is restricted to removable drives by the utility
   // process.
   Verify(mojo_base.mojom.FilePath source,
          mojo_base.mojom.FilePath target,
-         RemovableStorageWriterClient client);
+         pending_remote<RemovableStorageWriterClient> client);
 };
 
 interface RemovableStorageWriterClient {
diff --git a/chromium/chrome/services/util_win/public/mojom/util_win.typemap b/chromium/chrome/services/util_win/public/mojom/util_win.typemap
index b32b8e9a994..a4d414b3f0d 100644
--- a/chromium/chrome/services/util_win/public/mojom/util_win.typemap
+++ b/chromium/chrome/services/util_win/public/mojom/util_win.typemap
@@ -29,9 +29,9 @@ deps = [
 ]
 
 type_mappings = [
-  "chrome.mojom.AntiVirusProduct=metrics::SystemProfileProto_AntiVirusProduct",
-  "chrome.mojom.CertificateType=CertificateInfo::Type",
-  "chrome.mojom.FileFilterSpec=ui::FileFilterSpec",
-  "chrome.mojom.InspectionResult=ModuleInspectionResult[move_only]",
-  "chrome.mojom.SelectFileDialogType=ui::SelectFileDialog::Type",
+  "chrome.mojom.AntiVirusProduct=::metrics::SystemProfileProto_AntiVirusProduct",
+  "chrome.mojom.CertificateType=::CertificateInfo::Type",
+  "chrome.mojom.FileFilterSpec=::ui::FileFilterSpec",
+  "chrome.mojom.InspectionResult=::ModuleInspectionResult[move_only]",
+  "chrome.mojom.SelectFileDialogType=::ui::SelectFileDialog::Type",
 ]
diff --git a/chromium/chrome/services/wifi_util_win/BUILD.gn b/chromium/chrome/services/wifi_util_win/BUILD.gn
deleted file mode 100644
index 2a472af6f7e..00000000000
--- a/chromium/chrome/services/wifi_util_win/BUILD.gn
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2017 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.
-
-source_set("lib") {
-  sources = [
-    "wifi_credentials_getter.cc",
-    "wifi_credentials_getter.h",
-    "wifi_util_win_service.cc",
-    "wifi_util_win_service.h",
-  ]
-
-  deps = [
-    "//base",
-    "//mojo/public/cpp/bindings",
-  ]
-
-  public_deps = [
-    "//chrome/services/wifi_util_win/public/mojom",
-    "//services/service_manager/public/cpp",
-  ]
-}
diff --git a/chromium/chrome/services/wifi_util_win/public/cpp/BUILD.gn b/chromium/chrome/services/wifi_util_win/public/cpp/BUILD.gn
deleted file mode 100644
index 6406b73f475..00000000000
--- a/chromium/chrome/services/wifi_util_win/public/cpp/BUILD.gn
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2019 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.
-
-source_set("manifest") {
-  sources = [
-    "manifest.cc",
-    "manifest.h",
-  ]
-
-  deps = [
-    "//base",
-    "//chrome:strings",
-    "//chrome/services/wifi_util_win/public/mojom",
-    "//services/service_manager/public/cpp",
-  ]
-}
diff --git a/chromium/chrome/services/wifi_util_win/public/mojom/BUILD.gn b/chromium/chrome/services/wifi_util_win/public/mojom/BUILD.gn
deleted file mode 100644
index 89b560c8f6b..00000000000
--- a/chromium/chrome/services/wifi_util_win/public/mojom/BUILD.gn
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2017 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("mojom") {
-  sources = [
-    "wifi_credentials_getter.mojom",
-  ]
-
-  public_deps = [
-    ":constants",
-  ]
-}
-
-mojom("constants") {
-  sources = [
-    "constants.mojom",
-  ]
-}
diff --git a/chromium/chrome/services/wifi_util_win/public/mojom/constants.mojom b/chromium/chrome/services/wifi_util_win/public/mojom/constants.mojom
deleted file mode 100644
index b0487658691..00000000000
--- a/chromium/chrome/services/wifi_util_win/public/mojom/constants.mojom
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2017 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.
-
-module chrome.mojom;
-
-const string kWifiUtilWinServiceName = "wifi_util_win";
diff --git a/chromium/chrome/services/wifi_util_win/public/mojom/wifi_credentials_getter.mojom b/chromium/chrome/services/wifi_util_win/public/mojom/wifi_credentials_getter.mojom
deleted file mode 100644
index edb41281ffe..00000000000
--- a/chromium/chrome/services/wifi_util_win/public/mojom/wifi_credentials_getter.mojom
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 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.
-
-module chrome.mojom;
-
-// Interface for retrieving WiFi credentials for WiFi networks.
-// Must be run in a non sandboxed process with elevated privileges.
-interface WiFiCredentialsGetter {
-  const string kWiFiTestNetwork = "chrome://test-get-wifi-credentials";
-
-  // OS_WIN: Get plain-text WiFi credentials from the system (requires UAC
-  // privilege elevation). Returns |success| false if an error occurred or
-  // |success| true and the result in |key_data|.
-  GetWiFiCredentials(string ssid) => (bool success, string key_data);
-};