Refactor Blink's ServiceConnector and add ability to mock in layout tests

content/renderer/render_frame_impl.cc

Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index b1dfbf11a00a9b902bc14fb8fdd748b826634f04..615077a958336233dd648b7d585b80356387aa46 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -121,6 +121,8 @@
 #include "content/renderer/media/user_media_client_impl.h"
 #include "content/renderer/media/web_media_element_source_utils.h"
 #include "content/renderer/media/webmediaplayer_ms.h"
+#include "content/renderer/mojo/blink_connector_impl.h"
+#include "content/renderer/mojo/blink_connector_js_wrapper.h"
 #include "content/renderer/mojo/blink_interface_registry_impl.h"
 #include "content/renderer/mojo/interface_provider_js_wrapper.h"
 #include "content/renderer/mojo_bindings_controller.h"
@@ -134,6 +136,7 @@
 #include "content/renderer/render_thread_impl.h"
 #include "content/renderer/render_view_impl.h"
 #include "content/renderer/render_widget_fullscreen_pepper.h"
+#include "content/renderer/renderer_blink_platform_impl.h"
 #include "content/renderer/renderer_webapplicationcachehost_impl.h"
 #include "content/renderer/renderer_webcolorchooser_impl.h"
 #include "content/renderer/savable_resources.h"
@@ -2649,6 +2652,13 @@ void RenderFrameImpl::EnsureMojoBuiltinsAreAvailable(
       InterfaceProviderJsWrapper::Create(
           isolate, context, RenderThread::Get()->GetRemoteInterfaces())
           .ToV8());
+  registry->AddBuiltinModule(
+      isolate, BlinkConnectorJsWrapper::kModuleName,
+      BlinkConnectorJsWrapper::Create(
+          isolate, context,
+          static_cast<BlinkConnectorImpl*>(
+              RenderThreadImpl::current()->blink_platform_impl()->connector()))
+          .ToV8());
 }
 
 void RenderFrameImpl::AddMessageToConsole(ConsoleMessageLevel level,