Change the NaCl loader and broker processes to use the ServiceManager.

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 0d9ccbba4a16e44457e4719862b3c0de466c8b2b..b7cdbfb7b3df2d856c2a27b278549548eb301b8f 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -716,7 +716,19 @@ class CONTENT_EXPORT ContentBrowserClient {
   // 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);
+      base::StringPiece name);
+
+  struct ServiceManifestInfo {
+    // The name of the service.
+    std::string name;
+
+    // The resource ID of the manifest.
+    int resource_id;
+  };
+
+  // Allows the embedder to provide extra service manifests to be registered
+  // with the service manager context.
+  virtual std::vector<ServiceManifestInfo> GetExtraServiceManifests();
 
   // Allows to override the visibility state of a RenderFrameHost.
   // |visibility_state| should not be null. It will only be set if needed.