Add frame-specific InterfaceProviderSpec.

content/public/app/mojo/content_browser_manifest.json

Index: content/public/app/mojo/content_browser_manifest.json
diff --git a/content/public/app/mojo/content_browser_manifest.json b/content/public/app/mojo/content_browser_manifest.json
index 5a3cb192136f3d42c3668b361dfed7c6239cf8f0..49dad07fc12fb27cb378ad144688347dc45f559e 100644
--- a/content/public/app/mojo/content_browser_manifest.json
+++ b/content/public/app/mojo/content_browser_manifest.json
@@ -3,7 +3,6 @@
   "display_name": "Content (browser process)",
   "interface_provider_specs": {
     "service_manager:connector": {
-      // Remove this once http://crbug.com/632818 is fixed.
       "provides": {
         "gpu": [
           "device::mojom::PowerMonitor"
@@ -57,6 +56,39 @@
         "service:file": [ "file:filesystem", "file:leveldb" ],
         "service:media": [ "media:media" ]
       }
+    },
+    "navigation:frame": {
+      "provides": {
+        "renderer": [
+          // TODO(beng): these belong in //chrome's overlay, but there are some
+          // issues with mash browser_tests's manifest config that make this
+          // impossible this week. Remove once sky/ken fix this.
+          "autofill::mojom::AutofillDriver",
+          "autofill::mojom::PasswordManagerDriver",
+          "blink::mojom::MediaSessionService",
+          "blink::mojom::PaymentRequest",
+          "blink::mojom::PermissionService",
+          "blink::mojom::PresentationService",
+          "blink::mojom::SensitiveInputVisibilityService",
+          "blink::mojom::ShapeDetection",
+          "blink::mojom::WebBluetoothService",
+          "blink::mojom::WebSocket",
+          // TODO(beng): figure out how to overlay test interfaces like this.
+          "content::mojom::BrowserTarget",
+          "device::VibrationManager",
+          "device::mojom::GeolocationService",
+          "device::mojom::SensorProvider",
+          "device::mojom::WakeLockService",
+          "device::nfc::mojom::NFC",
+          "device::usb::DeviceManager",
+          "media::mojom::InterfaceFactory",
+          "media::mojom::RemoterFactory",
+          "mojom::MediaDevicesDispatcherHost"
+        ]
+      },
+      "requires": {
+        "service:content_renderer": [ "browser" ]
+      }
     }
   }
 }