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

content/shell/browser/shell_content_browser_client.cc

 // Copyright 2013 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/shell/browser/shell_content_browser_client.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/base_switches.h"
@@ skipping 201 matching lines @@
 #endif
 }
 
 void ShellContentBrowserClient::RegisterOutOfProcessServices(
       OutOfProcessServiceMap* services) {
   services->insert(std::make_pair(kTestServiceUrl,
                                   base::UTF8ToUTF16("Test Service")));
 }
 
 std::unique_ptr<base::Value>
-ShellContentBrowserClient::GetServiceManifestOverlay(
-    const std::string& name) {
+ShellContentBrowserClient::GetServiceManifestOverlay(base::StringPiece name) {
   int id = -1;
   if (name == content::mojom::kBrowserServiceName)
     id = IDR_CONTENT_SHELL_BROWSER_MANIFEST_OVERLAY;
   else if (name == content::mojom::kRendererServiceName)
     id = IDR_CONTENT_SHELL_RENDERER_MANIFEST_OVERLAY;
   else if (name == content::mojom::kUtilityServiceName)
     id = IDR_CONTENT_SHELL_UTILITY_MANIFEST_OVERLAY;
   if (id == -1)
     return nullptr;
 
@@ skipping 154 matching lines @@
 ShellBrowserContext* ShellContentBrowserClient::browser_context() {
   return shell_browser_main_parts_->browser_context();
 }
 
 ShellBrowserContext*
     ShellContentBrowserClient::off_the_record_browser_context() {
   return shell_browser_main_parts_->off_the_record_browser_context();
 }
 
 }  // namespace content