Enable connection to Mojo services from Blink

content/child/blink_platform_impl.cc

Index: content/child/blink_platform_impl.cc
diff --git a/content/child/blink_platform_impl.cc b/content/child/blink_platform_impl.cc
index 008687d00050c9ddafbf147aa3c0a0c3230247b9..7835947548c237649038d15a00c52a32f3d2ad17 100644
--- a/content/child/blink_platform_impl.cc
+++ b/content/child/blink_platform_impl.cc
@@ -48,7 +48,10 @@
 #include "content/child/web_url_request_util.h"
 #include "content/child/worker_thread_registry.h"
 #include "content/public/common/content_client.h"
+#include "content/public/common/service_manager_connection.h"
 #include "net/base/net_errors.h"
+#include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/interfaces/connector.mojom.h"
 #include "third_party/WebKit/public/platform/WebData.h"
 #include "third_party/WebKit/public/platform/WebFloatPoint.h"
 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
@@ -71,11 +74,6 @@ using blink::scheduler::WebThreadImplForWorkerScheduler;
 
 namespace content {
 
-namespace {
-
-
-}  // namespace
-
 static int ToMessageID(WebLocalizedString::Name name) {
   switch (name) {
     case WebLocalizedString::AXAMPMFieldText:
@@ -793,6 +791,19 @@ bool BlinkPlatformImpl::databaseSetFileSize(
   return false;
 }
 
+void BlinkPlatformImpl::bindServiceConnector(
+    service_manager::mojom::blink::ConnectorRequest request) {
+  if (!ChildThreadImpl::current())

[dcheng, 2016/12/19 11:13:21]

Is this a 'null in unit tests' type thing?

[blundell, 2016/12/19 15:05:31]

I confess that I cargo-culted this from BlinkPlatformImpl::InternalInit() based
on the comment there ("may not exist in some tests"). I didn't actually verify
that.

+    return;
+
+  service_manager::mojom::ConnectorRequest chromium_request;
+  chromium_request.Bind(request.PassMessagePipe());
+  ChildThreadImpl::current()
+      ->GetServiceManagerConnection()
+      ->GetConnector()
+      ->BindRequest(std::move(chromium_request));
+}
+
 blink::WebString BlinkPlatformImpl::signedPublicKeyAndChallengeString(
     unsigned key_size_index,
     const blink::WebString& challenge,