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

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 46e0df995800347283bff89e3fb9f0b3c3aa3ac9..0fa36eddb14ed15b6159afe419abf72efb859562 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -132,6 +132,7 @@
 #include "components/google/core/browser/google_util.h"
 #include "components/metrics/call_stack_profile_collector.h"
 #include "components/metrics/client_info.h"
+#include "components/nacl/common/nacl_constants.h"
 #include "components/net_log/chrome_net_log.h"
 #include "components/password_manager/content/browser/content_password_manager_driver_factory.h"
 #include "components/payments/payment_request.mojom.h"
@@ -3104,8 +3105,7 @@ void ChromeContentBrowserClient::RegisterOutOfProcessServices(
 }
 
 std::unique_ptr<base::Value>
-ChromeContentBrowserClient::GetServiceManifestOverlay(
-    const std::string& name) {
+ChromeContentBrowserClient::GetServiceManifestOverlay(base::StringPiece name) {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   int id = -1;
   if (name == content::mojom::kBrowserServiceName)
@@ -3126,6 +3126,18 @@ ChromeContentBrowserClient::GetServiceManifestOverlay(
   return base::JSONReader::Read(manifest_contents);
 }
 
+std::vector<content::ContentBrowserClient::ServiceManifestInfo>
+ChromeContentBrowserClient::GetExtraServiceManifests() {
+  return std::vector<content::ContentBrowserClient::ServiceManifestInfo>({
+#if !defined(DISABLE_NACL)
+    {nacl::kNaClLoaderServiceName, IDR_NACL_LOADER_MANIFEST},
+#if defined(OS_WIN)
+        {nacl::kNaClBrokerServiceName, IDR_NACL_BROKER_MANIFEST},
+#endif  // defined(OS_WIN)
+#endif  // !defined(DISABLE_NACL)
+  });
+}
+
 void ChromeContentBrowserClient::OpenURL(
     content::BrowserContext* browser_context,
     const content::OpenURLParams& params,