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

content/renderer/mojo/blink_connector_js_wrapper.cc

Index: content/renderer/mojo/blink_connector_js_wrapper.cc
diff --git a/content/renderer/mojo/blink_connector_js_wrapper.cc b/content/renderer/mojo/blink_connector_js_wrapper.cc
new file mode 100644
index 0000000000000000000000000000000000000000..e4f6278b66572200d7f1d8096c5ee2e3287ea22f
--- /dev/null
+++ b/content/renderer/mojo/blink_connector_js_wrapper.cc
@@ -0,0 +1,104 @@
+// Copyright 2017 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/renderer/mojo/blink_connector_js_wrapper.h"
+
+#include <memory>
+#include <utility>
+
+#include "content/renderer/mojo/blink_connector_impl.h"
+#include "mojo/edk/js/handle.h"
+#include "third_party/WebKit/public/web/WebLocalFrame.h"
+
+namespace content {
+
+gin::WrapperInfo BlinkConnectorJsWrapper::kWrapperInfo = {
+    gin::kEmbedderNativeGin};
+const char BlinkConnectorJsWrapper::kModuleName[] =
+    "content/public/renderer/connector";
+
+BlinkConnectorJsWrapper::~BlinkConnectorJsWrapper() {}
+
+// static
+gin::Handle<BlinkConnectorJsWrapper> BlinkConnectorJsWrapper::Create(
+    v8::Isolate* isolate,
+    v8::Handle<v8::Context> context,
+    BlinkConnectorImpl* connector) {
+  return gin::CreateHandle(
+      isolate,
+      new BlinkConnectorJsWrapper(isolate, context, connector->GetWeakPtr()));
+}
+
+gin::ObjectTemplateBuilder BlinkConnectorJsWrapper::GetObjectTemplateBuilder(
+    v8::Isolate* isolate) {
+  return Wrappable<BlinkConnectorJsWrapper>::GetObjectTemplateBuilder(isolate)
+      .SetMethod("getInterface", &BlinkConnectorJsWrapper::GetInterface)

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

Can we just do all of this inside blink instead?

+      .SetMethod("addInterfaceOverrideForTesting",
+                 &BlinkConnectorJsWrapper::AddOverrideForTesting)
+      .SetMethod("clearInterfaceOverridesForTesting",
+                 &BlinkConnectorJsWrapper::ClearOverridesForTesting);
+}
+
+mojo::Handle BlinkConnectorJsWrapper::GetInterface(
+    const std::string& service_name,
+    const std::string& interface_name) {
+  mojo::MessagePipe pipe;
+  if (connector_) {
+    connector_->getInterface(service_name.c_str(), interface_name.c_str(),
+                             std::move(pipe.handle0));
+  }
+  return pipe.handle1.release();
+}
+
+void BlinkConnectorJsWrapper::AddOverrideForTesting(
+    const std::string& service_name,
+    const std::string& interface_name,
+    v8::Local<v8::Function> service_factory) {
+  ScopedJsFactory factory(v8::Isolate::GetCurrent(), service_factory);
+  connector_->AddOverrideForTesting(
+      service_name, interface_name,
+      base::Bind(&BlinkConnectorJsWrapper::CallJsFactory,
+                 weak_factory_.GetWeakPtr(), factory));
+}
+
+void BlinkConnectorJsWrapper::ClearOverridesForTesting() {
+  connector_->ClearOverridesForTesting();
+}
+
+BlinkConnectorJsWrapper::BlinkConnectorJsWrapper(
+    v8::Isolate* isolate,
+    v8::Handle<v8::Context> context,
+    base::WeakPtr<BlinkConnectorImpl> connector)
+    : isolate_(isolate),
+      context_(isolate, context),
+      connector_(connector),
+      weak_factory_(this) {
+  context_.SetWeak(this, &BlinkConnectorJsWrapper::ClearContext,
+                   v8::WeakCallbackType::kParameter);
+}
+
+void BlinkConnectorJsWrapper::CallJsFactory(
+    const ScopedJsFactory& factory,
+    mojo::ScopedMessagePipeHandle pipe) {
+  if (context_.IsEmpty())
+    return;
+
+  v8::HandleScope handle_scope(isolate_);
+  v8::Handle<v8::Context> context = context_.Get(isolate_);
+  v8::Context::Scope context_scope(context);
+  v8::Local<v8::Value> argv[] = {
+      gin::ConvertToV8(isolate_, mojo::Handle(pipe.release().value()))};
+  blink::WebLocalFrame::frameForContext(context)

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

Does this work inside workers? This looks suspicious to me. I don't understand
why we need to inject JS directly like this. The tests should script src the
things they need.

+      ->callFunctionEvenIfScriptDisabled(factory.Get(isolate_),
+                                         v8::Undefined(isolate_), 1, argv);
+}
+
+// static
+void BlinkConnectorJsWrapper::ClearContext(
+    const v8::WeakCallbackInfo<BlinkConnectorJsWrapper>& data) {
+  BlinkConnectorJsWrapper* registry = data.GetParameter();
+  registry->context_.Reset();
+}
+
+}  // namespace content