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

content/browser/service_manager/service_manager_context.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 "content/browser/service_manager/service_manager_context.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 
@@ skipping 230 matching lines @@
         base::DictionaryValue* manifest_dictionary = nullptr;
         CHECK(manifest_value->GetAsDictionary(&manifest_dictionary));
         base::DictionaryValue* overlay_dictionary = nullptr;
         CHECK(overlay_value->GetAsDictionary(&overlay_dictionary));
         MergeDictionary(manifest_dictionary, overlay_dictionary);
       }
 
       manifest_provider->AddManifestValue(kManifests[i].name,
                                           std::move(manifest_value));
     }
+    for (const auto& manifest :
+         GetContentClient()->browser()->GetExtraServiceManifests()) {
+      std::string contents =
+          GetContentClient()
+              ->GetDataResource(manifest.second,
+                                ui::ScaleFactor::SCALE_FACTOR_NONE)
+              .as_string();
+      base::debug::Alias(&manifest.first);

[piman, 2016/11/23 18:08:10]

Why this?

[Sam McNally, 2016/11/24 02:10:41]

Copy-pasta. Removed it.

+      CHECK(!contents.empty());

[piman, 2016/11/23 18:08:11]

nit: DCHECK

[Sam McNally, 2016/11/24 02:10:41]

I've refactored this duplicate code out, keeping the CHECK. Given
https://bugs.chromium.org/p/chromium/issues/detail?id=653382 I'm inclined to
leave them as CHECKs in this CL.

+
+      std::unique_ptr<base::Value> manifest_value =
+          base::JSONReader::Read(contents);
+      base::debug::Alias(&contents);

[piman, 2016/11/23 18:08:11]

Why this?

[Sam McNally, 2016/11/24 02:10:41]

Copy-pasta.

+      CHECK(manifest_value);

[piman, 2016/11/23 18:08:11]

nit: DCHECK

[Sam McNally, 2016/11/24 02:10:41]

Same as with the above CHECK.

+
+      manifest_provider->AddManifestValue(manifest.first,
+                                          std::move(manifest_value));

[piman, 2016/11/23 18:08:11]

This block looks like a bunch of copy/paste from the block above. This function
is getting long, is there a way we could refactor these 2 into a separate
function?

[Sam McNally, 2016/11/24 02:10:41]

Done.

+    }
     in_process_context_ = new InProcessServiceManagerContext;
     request = in_process_context_->Start(std::move(manifest_provider));
   }
   ServiceManagerConnection::SetForProcess(ServiceManagerConnection::Create(
       std::move(request),
       BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)));
 
   ContentBrowserClient::StaticServiceMap services;
   GetContentClient()->browser()->RegisterInProcessServices(&services);
   for (const auto& entry : services) {
@@ skipping 50 matching lines @@
                           base::Bind(&DestroyConnectorOnIOThread));
 }
 
 // static
 service_manager::Connector* ServiceManagerContext::GetConnectorForIOThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   return g_io_thread_connector.Get().get();
 }
 
 }  // namespace content