1 files changed, 66 insertions, 18 deletions
diff --git a/chromium/chrome/browser/chrome_content_browser_manifest_overlay.json b/chromium/chrome/browser/chrome_content_browser_manifest_overlay.json
index 3d6190b0822..f1004cbf6de 100644
--- a/chromium/chrome/browser/chrome_content_browser_manifest_overlay.json
+++ b/chromium/chrome/browser/chrome_content_browser_manifest_overlay.json
@@ -1,22 +1,70 @@
 {
-  "name": "service:content_browser",
-  "capabilities": {
-    "provided": {
-      "renderer": [
-        "autofill::mojom::AutofillDriver",
-        "autofill::mojom::PasswordManagerDriver",
-        "extensions::StashService",
-        "metrics::mojom::LeakDetector",
-        "startup_metric_utils::mojom::StartupMetricHost",
-        "translate::mojom::ContentTranslateDriver"
-      ],
-      "gpu": [
-        "metrics::mojom::CallStackProfileCollector"
-      ],
-      "ash": [
-        "ash::mojom::SystemTray",
-        "ash::mojom::SystemTrayClient"
-      ]
+  "name": "content_browser",
+  "display_name": "Chrome",
+  "interface_provider_specs": {
+    "service_manager:connector": {
+      "provides": {
+        "renderer": [
+          "autofill::mojom::AutofillDriver",
+          "autofill::mojom::PasswordManagerDriver",
+          "extensions::StashService",
+          "metrics::mojom::LeakDetector",
+          "rappor::mojom::RapporRecorder",
+          "startup_metric_utils::mojom::StartupMetricHost",
+          "translate::mojom::ContentTranslateDriver"
+        ],
+        "gpu": [
+          "metrics::mojom::CallStackProfileCollector"
+        ],
+        "ash": [
+          // Under classic ash the browser provides some of the ash interfaces
+          // to itself.
+          "ash::mojom::LocaleNotificationController",
+          "ash::mojom::NewWindowClient",
+          "ash::mojom::ShelfController",
+          "ash::mojom::ShutdownController",
+          "ash::mojom::SystemTray",
+          "ash::mojom::SystemTrayClient",
+          "ash::mojom::WallpaperController",
+          "ash::mojom::WallpaperManager",
+          "ash::mojom::VolumeController",
+          "keyboard::mojom::Keyboard"
+        ],
+        "mash:launchable": [
+          "mash::mojom::Launchable"
+        ]
+      },
+      "requires": {
+        "ash": [ "ash" ],
+        "image_decoder": [ "decode" ]
+      }
+    },
+    "navigation:frame": {
+      "provides": {
+        "renderer": [
+          "autofill::mojom::AutofillDriver",
+          "autofill::mojom::PasswordManagerDriver",
+          "blink::mojom::ShareService",
+          "bluetooth::mojom::AdapterFactory",
+          "device::usb::ChooserService",
+          "device::usb::DeviceManager",
+          "contextual_search::mojom::ContextualSearchJsApiService",
+          "dom_distiller::mojom::DistillabilityService",
+          "dom_distiller::mojom::DistillerJavaScriptService",
+          "extensions::KeepAlive",
+          "extensions::mime_handler::MimeHandlerService",
+          "media_router::mojom::MediaRouter",
+          "mojom::OmniboxPageHandler",
+          "password_manager::mojom::CredentialManager",
+          "translate::mojom::ContentTranslateDriver",
+
+          // TODO(beng): These should be moved to a separate capability.
+          "mojom::OmniboxPageHandler",
+          "mojom::PluginsPageHandler",
+          "mojom::SiteEngagementUIHandler",
+          "mojom::UsbInternalsPageHandler"
+        ]
+      }
     }
   }
 }