Change RenderFrame to use InterfaceRegistry et al.

content/renderer/render_thread_impl.cc

Index: content/renderer/render_thread_impl.cc
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index e44661129283c8f6ab0872a8447defce1666a800..e523e0b1a5da722d8fdcee822831e6e3fa738055 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -824,11 +824,11 @@ void RenderThreadImpl::Init(
   base::DiscardableMemoryAllocator::SetInstance(
       ChildThreadImpl::discardable_shared_memory_manager());
 
-  GetContentClient()->renderer()->RegisterProcessMojoServices(
-      service_registry());
+  GetContentClient()->renderer()->RegisterProcessMojoInterfaces(
+      interface_registry());
 
-  service_registry()->AddService(base::Bind(CreateFrameFactory));
-  service_registry()->AddService(base::Bind(CreateEmbeddedWorkerSetup));
+  interface_registry()->AddInterface(base::Bind(CreateFrameFactory));
+  interface_registry()->AddInterface(base::Bind(CreateEmbeddedWorkerSetup));
 
 #if defined(MOJO_SHELL_CLIENT)
   // We may not have a MojoShellConnection object in tests that directly
@@ -839,7 +839,7 @@ void RenderThreadImpl::Init(
     CreateRenderWidgetWindowTreeClientFactory();
 #endif
 
-  service_registry()->ConnectToRemoteService(
+  remote_interfaces()->GetInterface(
       mojo::GetProxy(&storage_partition_service_));
 
   is_renderer_suspended_ = false;
@@ -1156,7 +1156,7 @@ void RenderThreadImpl::InitializeWebKit(
 
   blink_platform_impl_.reset(new RendererBlinkPlatformImpl(
       renderer_scheduler_.get(),
-      static_cast<ServiceRegistryImpl*>(service_registry())->GetWeakPtr()));
+      remote_interfaces()->GetWeakPtr()));
   blink::initialize(blink_platform_impl_.get());
 
   v8::Isolate* isolate = blink::mainThreadIsolate();
@@ -1544,9 +1544,14 @@ void RenderThreadImpl::PreCacheFontCharacters(const LOGFONT& log_font,
 
 #endif  // OS_WIN
 
-ServiceRegistry* RenderThreadImpl::GetServiceRegistry() {
-  DCHECK(service_registry());
-  return service_registry();
+shell::InterfaceRegistry* RenderThreadImpl::GetInterfaceRegistry() {
+  DCHECK(interface_registry());
+  return interface_registry();
+}
+
+shell::InterfaceProvider* RenderThreadImpl::GetRemoteInterfaces() {
+  DCHECK(remote_interfaces());
+  return remote_interfaces();
 }
 
 bool RenderThreadImpl::IsGpuRasterizationForced() {