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

android_webview/browser/aw_content_browser_client.cc

Index: android_webview/browser/aw_content_browser_client.cc
diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc
index b87bb97be5e3e3293d9ebbbfed719d103347de7f..efe6935735bed82ecafed8a94b14e209ab938dd9 100644
--- a/android_webview/browser/aw_content_browser_client.cc
+++ b/android_webview/browser/aw_content_browser_client.cc
@@ -533,8 +533,8 @@ AwContentBrowserClient::GetDevToolsManagerDelegate() {
   return new AwDevToolsManagerDelegate();
 }
 
-std::unique_ptr<base::Value>
-AwContentBrowserClient::GetServiceManifestOverlay(const std::string& name) {
+std::unique_ptr<base::Value> AwContentBrowserClient::GetServiceManifestOverlay(
+    base::StringPiece name) {
   int id = -1;
   if (name == content::mojom::kBrowserServiceName)
     id = IDR_AW_BROWSER_MANIFEST_OVERLAY;