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

content/public/browser/content_browser_client.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/public/browser/content_browser_client.h"
 
 #include "base/files/file_path.h"
 #include "base/guid.h"
 #include "build/build_config.h"
 #include "content/public/browser/client_certificate_delegate.h"
@@ skipping 402 matching lines @@
   // Embedders should override this method and return different SIDs for each
   // sandbox type. Note: All content level tests will run child processes in the
   // same AppContainer.
   return base::string16(
       L"S-1-15-2-3251537155-1984446955-2931258699-841473695-1938553385-"
       L"924012148-129201922");
 }
 #endif  // defined(OS_WIN)
 
 std::unique_ptr<base::Value> ContentBrowserClient::GetServiceManifestOverlay(
-    const std::string& name) {
+    base::StringPiece name) {
   return nullptr;
 }
 
+std::vector<ContentBrowserClient::ServiceManifestInfo>
+ContentBrowserClient::GetExtraServiceManifests() {
+  return std::vector<ContentBrowserClient::ServiceManifestInfo>();
+}
+
 std::unique_ptr<MemoryCoordinatorDelegate>
 ContentBrowserClient::GetMemoryCoordinatorDelegate() {
   return std::unique_ptr<MemoryCoordinatorDelegate>();
 }
 
 ::rappor::RapporService* ContentBrowserClient::GetRapporService() {
   return nullptr;
 }
 
 bool ContentBrowserClient::ShouldRedirectDOMStorageTaskRunner() {
   return false;
 }
 
 bool ContentBrowserClient::RedirectNonUINonIOBrowserThreadsToTaskScheduler() {
   return false;
 }
 
 }  // namespace content