3 files changed, 13 insertions, 6 deletions
diff --git a/content/renderer/mojo/service_registry_js_wrapper.cc b/content/renderer/mojo/service_registry_js_wrapper.cc
index 094fb02..1ab8b86 100644
--- a/content/renderer/mojo/service_registry_js_wrapper.cc
+++ b/content/renderer/mojo/service_registry_js_wrapper.cc
@@ -16,8 +16,10 @@ namespace content {
 
 gin::WrapperInfo ServiceRegistryJsWrapper::kWrapperInfo = {
     gin::kEmbedderNativeGin};
-const char ServiceRegistryJsWrapper::kModuleName[] =
-    "content/public/renderer/service_provider";
+const char ServiceRegistryJsWrapper::kPerFrameModuleName[] =
+    "content/public/renderer/frame_service_registry";
+const char ServiceRegistryJsWrapper::kPerProcessModuleName[] =
+    "content/public/renderer/service_registry";
 
 ServiceRegistryJsWrapper::~ServiceRegistryJsWrapper() {
 }
@@ -57,8 +59,7 @@ mojo::Handle ServiceRegistryJsWrapper::ConnectToService(
 void ServiceRegistryJsWrapper::AddServiceOverrideForTesting(
     const std::string& service_name,
     v8::Local<v8::Function> service_factory) {
-  ServiceRegistryImpl* registry =
-      static_cast<ServiceRegistryImpl*>(service_registry_.get());
+  ServiceRegistry* registry = service_registry_.get();
   if (!registry)
     return;
   ScopedJsFactory factory(v8::Isolate::GetCurrent(), service_factory);
diff --git a/content/renderer/mojo/service_registry_js_wrapper.h b/content/renderer/mojo/service_registry_js_wrapper.h
index f199c63..5fc2f63 100644
--- a/content/renderer/mojo/service_registry_js_wrapper.h
+++ b/content/renderer/mojo/service_registry_js_wrapper.h
@@ -41,7 +41,8 @@ class CONTENT_EXPORT ServiceRegistryJsWrapper
   mojo::Handle ConnectToService(const std::string& service_name);
 
   static gin::WrapperInfo kWrapperInfo;
-  static const char kModuleName[];
+  static const char kPerFrameModuleName[];
+  static const char kPerProcessModuleName[];
 
  private:
   using ScopedJsFactory =
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index a41cdb2..2465688 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -2320,9 +2320,14 @@ void RenderFrameImpl::EnsureMojoBuiltinsAreAvailable(
   registry->AddBuiltinModule(isolate, mojo::edk::js::Support::kModuleName,
                              mojo::edk::js::Support::GetModule(isolate));
   registry->AddBuiltinModule(
-      isolate, ServiceRegistryJsWrapper::kModuleName,
+      isolate, ServiceRegistryJsWrapper::kPerFrameModuleName,
       ServiceRegistryJsWrapper::Create(isolate, context, &service_registry_)
           .ToV8());
+  registry->AddBuiltinModule(
+      isolate, ServiceRegistryJsWrapper::kPerProcessModuleName,
+      ServiceRegistryJsWrapper::Create(
+          isolate, context, RenderThread::Get()->GetServiceRegistry())
+          .ToV8());
 }
 
 void RenderFrameImpl::AddMessageToConsole(ConsoleMessageLevel level,