Enable connection to Mojo services from Blink

content/child/blink_platform_impl.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/child/blink_platform_impl.h"
 
 #include <math.h>
 
 #include <memory>
 #include <vector>
@@ skipping 30 matching lines @@
 #include "content/child/content_child_helpers.h"
 #include "content/child/notifications/notification_dispatcher.h"
 #include "content/child/notifications/notification_manager.h"
 #include "content/child/push_messaging/push_dispatcher.h"
 #include "content/child/push_messaging/push_provider.h"
 #include "content/child/thread_safe_sender.h"
 #include "content/child/web_url_loader_impl.h"
 #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"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/platform/scheduler/child/webthread_impl_for_worker_scheduler.h"
 #include "ui/base/layout.h"
 #include "ui/events/gestures/blink/web_gesture_curve_impl.h"
 #include "ui/events/keycodes/dom/keycode_converter.h"
 
 using blink::WebData;
 using blink::WebFallbackThemeEngine;
 using blink::WebLocalizedString;
 using blink::WebString;
 using blink::WebThemeEngine;
 using blink::WebURL;
 using blink::WebURLError;
 using blink::WebURLLoader;
 using blink::scheduler::WebThreadImplForWorkerScheduler;
 
 namespace content {
 
-namespace {
-
-
-}  // namespace
-
 static int ToMessageID(WebLocalizedString::Name name) {
   switch (name) {
     case WebLocalizedString::AXAMPMFieldText:
       return IDS_AX_AM_PM_FIELD_TEXT;
     case WebLocalizedString::AXCalendarShowMonthSelector:
       return IDS_AX_CALENDAR_SHOW_MONTH_SELECTOR;
     case WebLocalizedString::AXCalendarShowNextMonth:
       return IDS_AX_CALENDAR_SHOW_NEXT_MONTH;
     case WebLocalizedString::AXCalendarShowPreviousMonth:
       return IDS_AX_CALENDAR_SHOW_PREVIOUS_MONTH;
@@ skipping 697 matching lines @@
 long long BlinkPlatformImpl::databaseGetSpaceAvailableForOrigin(
     const blink::WebSecurityOrigin& origin) {
   return 0;
 }
 
 bool BlinkPlatformImpl::databaseSetFileSize(
     const blink::WebString& vfs_file_name, long long size) {
   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,
     const blink::WebURL& url,
     const blink::WebURL& top_origin) {
   return blink::WebString("");
 }
 
 size_t BlinkPlatformImpl::actualMemoryUsageMB() {
   return GetMemoryUsageKB() >> 10;
@@ skipping 48 matching lines @@
   return WebString::fromUTF8(ui::KeycodeConverter::DomKeyToKeyString(
       static_cast<ui::DomKey>(dom_key)));
 }
 
 int BlinkPlatformImpl::domKeyEnumFromString(const WebString& key_string) {
   return static_cast<int>(
       ui::KeycodeConverter::KeyStringToDomKey(key_string.utf8()));
 }
 
 }  // namespace content