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 a04b768c1a9589613ca4175abcd996ca9f487702..3d4a2ce3d14126de869087399ef54139f522a5ff 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -708,6 +708,18 @@ class CONTENT_EXPORT ContentBrowserClient {
   virtual std::unique_ptr<base::Value> GetServiceManifestOverlay(
       const std::string& 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.
   virtual void OverridePageVisibilityState(