Add blink::ServiceRegistry and expose it from LocalFrame and Platform.

content/renderer/renderer_blink_platform_impl.cc

Index: content/renderer/renderer_blink_platform_impl.cc
diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
index bc4fdfbd97e2e233dcc6f960f95a3142e9dc8d60..4113c3186671f20b589f5c13dd5d9795ce30071b 100644
--- a/content/renderer/renderer_blink_platform_impl.cc
+++ b/content/renderer/renderer_blink_platform_impl.cc
@@ -69,6 +69,7 @@
 #include "content/renderer/media/renderer_webaudiodevice_impl.h"
 #include "content/renderer/media/renderer_webmidiaccessor_impl.h"
 #include "content/renderer/media/rtc_certificate_generator.h"
+#include "content/renderer/mojo/blink_service_registry_wrapper.h"
 #include "content/renderer/render_thread_impl.h"
 #include "content/renderer/renderer_clipboard_delegate.h"
 #include "content/renderer/screen_orientation/screen_orientation_observer.h"
@@ -249,7 +250,11 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
       default_task_runner_(renderer_scheduler->DefaultTaskRunner()),
       loading_task_runner_(renderer_scheduler->LoadingTaskRunner()),
       web_scrollbar_behavior_(new WebScrollbarBehaviorImpl),
-      renderer_scheduler_(renderer_scheduler) {
+      renderer_scheduler_(renderer_scheduler),
+      service_registry_wrapper_(
+          RenderThread::Get() ? new BlinkServiceRegistryWrapper(

[esprehn, 2016/03/29 05:26:20]

There's a RenderThreadImpl::current() check inside new
BlinkServiceRegistryWrapper, but we check RenderThread::Get() here, how can
::current() be null but RenderThread::Get() not be?

[Sam McNally, 2016/03/30 00:20:53]

If a MockRenderThread is used, RenderThread::Get() will return it, but
RenderThreadImpl::current() will return nullptr.

+                                    RenderThread::Get()->GetServiceRegistry())
+                              : nullptr) {
 #if !defined(OS_ANDROID) && !defined(OS_WIN)
   if (g_sandbox_enabled && sandboxEnabled()) {
     sandbox_support_.reset(new RendererBlinkPlatformImpl::SandboxSupport);
@@ -1163,19 +1168,8 @@ void RendererBlinkPlatformImpl::SetPlatformEventObserverForTesting(
   platform_event_observers_.AddWithID(observer.release(), type);
 }
 
-void RendererBlinkPlatformImpl::connectToRemoteService(
-    const char* name,
-    mojo::ScopedMessagePipeHandle handle) {
-  // In the layout test mode, mock services should be used instead.
-  // TODO(yukishiino): We'd like to inject mock services implemented in
-  // JavaScript.  Remove the following hack once we support JS-bindings
-  // of Mojo and service mocking in JS.
-  if (RenderThreadImpl::current() &&
-      RenderThreadImpl::current()->layout_test_mode())
-    return;
-
-  RenderThread::Get()->GetServiceRegistry()->ConnectToRemoteService(
-      name, std::move(handle));
+blink::ServiceRegistry* RendererBlinkPlatformImpl::serviceRegistry() {
+  return service_registry_wrapper_.get();
 }
 
 void RendererBlinkPlatformImpl::startListening(