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

chrome/browser/chrome_content_browser_client.h

Index: chrome/browser/chrome_content_browser_client.h
diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h
index 6c01bb642578e08ac405e462c73c21e3bb0b0fa7..dfa0d82635a346e3a3ae983bbabfaeae917f9332 100644
--- a/chrome/browser/chrome_content_browser_client.h
+++ b/chrome/browser/chrome_content_browser_client.h
@@ -298,7 +298,9 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
   void RegisterOutOfProcessServices(
       OutOfProcessServiceMap* services) override;
   std::unique_ptr<base::Value> GetServiceManifestOverlay(
-      const std::string& name) override;
+      base::StringPiece name) override;
+  std::vector<content::ContentBrowserClient::ServiceManifestInfo>
+  GetExtraServiceManifests() override;
   void OpenURL(content::BrowserContext* browser_context,
                const content::OpenURLParams& params,
                const base::Callback<void(content::WebContents*)>& callback)