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

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 462b14446b039bc4656e610f6db29ec36b305c3a..5e8461d35386976b3056c864b1ccc3a9f8728d23 100644
--- a/content/renderer/renderer_blink_platform_impl.cc
+++ b/content/renderer/renderer_blink_platform_impl.cc
@@ -41,6 +41,7 @@
 #include "content/common/frame_messages.h"
 #include "content/common/render_process_messages.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/common/service_manager_connection.h"
 #include "content/public/common/webplugininfo.h"
 #include "content/public/renderer/content_renderer_client.h"
 #include "content/public/renderer/media_stream_utils.h"
@@ -62,6 +63,7 @@
 #include "content/renderer/media/media_recorder_handler.h"
 #include "content/renderer/media/renderer_webaudiodevice_impl.h"
 #include "content/renderer/media/renderer_webmidiaccessor_impl.h"
+#include "content/renderer/mojo/blink_connector_impl.h"
 #include "content/renderer/mojo/blink_interface_provider_impl.h"
 #include "content/renderer/render_thread_impl.h"
 #include "content/renderer/renderer_clipboard_delegate.h"
@@ -79,6 +81,7 @@
 #include "media/filters/stream_parser_factory.h"
 #include "mojo/public/cpp/bindings/associated_group.h"
 #include "ppapi/features/features.h"
+#include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/cpp/interface_provider.h"
 #include "services/ui/public/cpp/gpu/context_provider_command_buffer.h"
 #include "storage/common/database/database_identifier.h"
@@ -248,6 +251,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
       loading_task_runner_(renderer_scheduler->LoadingTaskRunner()),
       web_scrollbar_behavior_(new WebScrollbarBehaviorImpl),
       renderer_scheduler_(renderer_scheduler),
+      blink_connector_(new BlinkConnectorImpl(nullptr)),
       blink_interface_provider_(
           new BlinkInterfaceProviderImpl(remote_interfaces)) {
 #if !defined(OS_ANDROID) && !defined(OS_WIN)
@@ -260,6 +264,10 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
 
   // RenderThread may not exist in some tests.
   if (RenderThreadImpl::current()) {
+    blink_connector_->SetConnector(RenderThreadImpl::current()

[esprehn, 2017/02/01 06:02:23]

Lets just do this inside blink itself. Pass the ServiceManager connection into
blink and implement all of the machinery down there.

+                                       ->GetServiceManagerConnection()
+                                       ->GetConnector()
+                                       ->Clone());
     sync_message_filter_ = RenderThreadImpl::current()->sync_message_filter();
     thread_safe_sender_ = RenderThreadImpl::current()->thread_safe_sender();
     quota_message_filter_ = RenderThreadImpl::current()->quota_message_filter();
@@ -1189,6 +1197,10 @@ void RendererBlinkPlatformImpl::SetPlatformEventObserverForTesting(
   platform_event_observers_.AddWithID(std::move(observer), type);
 }
 
+blink::Connector* RendererBlinkPlatformImpl::connector() {
+  return blink_connector_.get();
+}
+
 blink::InterfaceProvider* RendererBlinkPlatformImpl::interfaceProvider() {
   return blink_interface_provider_.get();
 }