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 586c59ef787b136e3806b83c7b622659398e88f7..7772723dbfebfeff5523ee0a5c71b6faa5804a94 100644
--- a/content/renderer/renderer_blink_platform_impl.cc
+++ b/content/renderer/renderer_blink_platform_impl.cc
@@ -42,6 +42,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"
@@ -63,6 +64,7 @@
 #include "content/renderer/media_capture_from_element/html_audio_element_capturer_source.h"
 #include "content/renderer/media_capture_from_element/html_video_element_capturer_source.h"
 #include "content/renderer/media_recorder/media_recorder_handler.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"
@@ -78,6 +80,7 @@
 #include "media/blink/webcontentdecryptionmodule_impl.h"
 #include "media/filters/stream_parser_factory.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"
@@ -249,6 +252,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)
@@ -261,6 +265,10 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
 
   // RenderThread may not exist in some tests.
   if (RenderThreadImpl::current()) {

[dcheng, 2017/03/21 18:56:18]

Ah... bah. This issue again...

I guess you can ignore my comment about null for testing for now, since it's
related to the long-standing issue of RenderThreadImpl::current() in tests =/

+    blink_connector_->SetConnector(RenderThreadImpl::current()
+                                       ->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();
@@ -1149,6 +1157,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();
 }