Enforce capability spec renderer <--> browser

content/public/browser/content_browser_client.h

Index: content/public/browser/content_browser_client.h
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 6da43c333166b7691eb7337088db5b0da45b070d..012b88a16a10e714753f59a906056bfedfaff18f 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -706,16 +706,12 @@ class CONTENT_EXPORT ContentBrowserClient {
   virtual void RegisterUnsandboxedOutOfProcessMojoApplications(
       OutOfProcessMojoApplicationMap* apps) {}
 
-  // A map of Mojo application names to corresponding manifest contents.
-  using MojoApplicationManifestMap = std::map<std::string, std::string>;
-
-  // Registers manifest contents for Mojo applications.
-  // See "services/shell/manifest.json" for an example Mojo app manifest.
-  //
-  // TODO(rockot): http://crbug.com/610426. Add more documentations about
-  //  Mojo app manifest.
-  virtual void RegisterMojoApplicationManifests(
-      MojoApplicationManifestMap* manifests) {}
+  // Allow the embedder to provide a dictionary loaded from a JSON file
+  // resembling a service manifest whose capabilities section will be merged
+  // with content's own for |name|. Additional entries will be appended to their
+  // respective sections.
+  virtual std::unique_ptr<base::Value> GetServiceManifestOverlay(
+      const std::string& name);
 
   // Allows to override the visibility state of a RenderFrameHost.
   // |visibility_state| should not be null. It will only be set if needed.