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

headless/lib/browser/headless_content_browser_client.cc

Index: headless/lib/browser/headless_content_browser_client.cc
diff --git a/headless/lib/browser/headless_content_browser_client.cc b/headless/lib/browser/headless_content_browser_client.cc
index 1bfe88ff8cbb5d866c8130a33c387e863850e70b..8ba656c082c559fe835bdd2debe8073f5ecdef75 100644
--- a/headless/lib/browser/headless_content_browser_client.cc
+++ b/headless/lib/browser/headless_content_browser_client.cc
@@ -61,7 +61,7 @@ HeadlessContentBrowserClient::GetDevToolsManagerDelegate() {
 
 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;