Revert "Share a single ServiceRegistry for all render frames in a process."

This reverts commit ac2a36e6cdb4739bcba077ac90950831c49b3e15.

We can go back to using a per-frame ServiceRegistry because
MessagePipes are cheaper now.

[+ drive-by formatting of content/common/BUILD.gn]

BUG=557909
TBR=jam@chromium.org

Review URL: https://codereview.chromium.org/1530333002

Cr-Commit-Position: refs/heads/master@{#365638}

1 files changed, 6 insertions, 5 deletions

diff --git a/content/renderer/mojo/service_registry_js_wrapper.cc b/content/renderer/mojo/service_registry_js_wrapper.cc
index 19c2bd7..4840b1e 100644
--- a/content/renderer/mojo/service_registry_js_wrapper.cc
+++ b/content/renderer/mojo/service_registry_js_wrapper.cc
@@ -4,8 +4,6 @@
 
 #include "content/renderer/mojo/service_registry_js_wrapper.h"
 
-#include <utility>
-
 #include "content/common/mojo/service_registry_impl.h"
 #include "content/public/common/service_registry.h"
 #include "third_party/mojo/src/mojo/edk/js/handle.h"
@@ -23,9 +21,11 @@ ServiceRegistryJsWrapper::~ServiceRegistryJsWrapper() {
 // static
 gin::Handle<ServiceRegistryJsWrapper> ServiceRegistryJsWrapper::Create(
     v8::Isolate* isolate,
-    base::WeakPtr<ServiceRegistry> service_registry) {
+    ServiceRegistry* service_registry) {
   return gin::CreateHandle(
-      isolate, new ServiceRegistryJsWrapper(service_registry));
+      isolate,
+      new ServiceRegistryJsWrapper(
+          static_cast<ServiceRegistryImpl*>(service_registry)->GetWeakPtr()));
 }
 
 gin::ObjectTemplateBuilder ServiceRegistryJsWrapper::GetObjectTemplateBuilder(
@@ -39,7 +39,8 @@ mojo::Handle ServiceRegistryJsWrapper::ConnectToService(
     const std::string& service_name) {
   mojo::MessagePipe pipe;
   if (service_registry_)
-    service_registry_->Connect(service_name, std::move(pipe.handle0));
+    service_registry_->ConnectToRemoteService(service_name,
+                                              pipe.handle0.Pass());
   return pipe.handle1.release();
 }