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

headless/lib/browser/headless_content_browser_client.cc

 // Copyright 2015 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 "headless/lib/browser/headless_content_browser_client.h"
 
 #include <memory>
 #include <unordered_set>
 
 #include "base/callback.h"
@@ skipping 45 matching lines @@
     callback.Run(prefs);
 }
 
 content::DevToolsManagerDelegate*
 HeadlessContentBrowserClient::GetDevToolsManagerDelegate() {
   return new HeadlessDevToolsManagerDelegate(browser_->GetWeakPtr());
 }
 
 std::unique_ptr<base::Value>
 HeadlessContentBrowserClient::GetServiceManifestOverlay(
-    const std::string& name) {
+    base::StringPiece name) {
   if (name != content::mojom::kBrowserServiceName ||
       browser_->options()->mojo_service_names.empty())
     return nullptr;
 
   base::StringPiece manifest_template =
       ui::ResourceBundle::GetSharedInstance().GetRawDataResource(
           IDR_HEADLESS_BROWSER_MANIFEST_OVERLAY_TEMPLATE);
   std::unique_ptr<base::Value> manifest =
       base::JSONReader::Read(manifest_template);
 
@@ skipping 16 matching lines @@
     content::StoragePartition* partition,
     const storage::OptionalQuotaSettingsCallback& callback) {
   content::BrowserThread::PostTaskAndReplyWithResult(
       content::BrowserThread::FILE, FROM_HERE,
       base::Bind(&storage::CalculateNominalDynamicSettings,
                  partition->GetPath(), context->IsOffTheRecord()),
       callback);
 }
 
 }  // namespace headless