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

blimp/engine/app/blimp_content_browser_client.cc

 // Copyright (c) 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 "base/json/json_reader.h"
 #include "blimp/engine/app/blimp_browser_main_parts.h"
 #include "blimp/engine/app/blimp_content_browser_client.h"
 #include "blimp/engine/app/settings_manager.h"
 #include "blimp/engine/grit/blimp_browser_resources.h"
 #include "blimp/engine/mojo/blob_channel_service.h"
@@ skipping 38 matching lines @@
 
 void BlimpContentBrowserClient::ExposeInterfacesToRenderer(
     service_manager::InterfaceRegistry* registry,
     content::RenderProcessHost* render_process_host) {
   registry->AddInterface<mojom::BlobChannel>(base::Bind(
       &BlobChannelService::BindRequest,
       base::Unretained(blimp_browser_main_parts_->GetBlobChannelService())));
 }
 
 std::unique_ptr<base::Value>
-BlimpContentBrowserClient::GetServiceManifestOverlay(
-    const std::string& name) {
+BlimpContentBrowserClient::GetServiceManifestOverlay(base::StringPiece name) {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   int id = -1;
   if (name == content::mojom::kBrowserServiceName) {
     id = IDR_BLIMP_CONTENT_BROWSER_MANIFEST_OVERLAY;
   }
   if (id == -1) {
     return nullptr;
   }
 
   base::StringPiece manifest_contents =
       rb.GetRawDataResourceForScale(id, ui::ScaleFactor::SCALE_FACTOR_NONE);
   return base::JSONReader::Read(manifest_contents);
 }
 
 void BlimpContentBrowserClient::GetQuotaSettings(
     content::BrowserContext* context,
     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 engine
 }  // namespace blimp