Update navigator.services API to use the new services.onconnect event [2/3].

content/child/navigator_connect/service_port_dispatcher_impl.cc

+// Copyright 2015 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/navigator_connect/service_port_dispatcher_impl.h"
+
+#include "base/trace_event/trace_event.h"
+#include "mojo/common/common_type_converters.h"
+#include "mojo/common/url_type_converters.h"
+#include "third_party/WebKit/public/web/WebServiceWorkerContextProxy.h"
+
+namespace content {
+
+namespace {
+
+class ConnectCallbacks : public blink::WebServicePortConnectEventCallbacks {

[michaeln, 2015/07/15 02:47:26]

nit: maybe name this differently to make it more obvious that a ConnectCallbacks
and a ConnectCallback are difference things. WebConnectCallbacksImpl maybe?

[Marijn Kruisselbrink, 2015/07/15 20:49:40]

Good point, done.

[michaeln, 2015/07/16 22:23:46]

thnx!

+ public:
+  ConnectCallbacks(const ServicePortDispatcher::ConnectCallback& callback)
+      : callback_(callback) {}
+
+  ~ConnectCallbacks() override {}
+
+  void onSuccess(blink::WebServicePort* port) override {
+    callback_.Run(SERVICE_PORT_CONNECT_RESULT_ACCEPT,
+                  mojo::String::From<base::string16>(port->name),
+                  mojo::String::From<base::string16>(port->data));
+  }
+
+  void onError() override {
+    callback_.Run(SERVICE_PORT_CONNECT_RESULT_REJECT, mojo::String(""),
+                  mojo::String(""));
+  }
+
+ private:
+  ServicePortDispatcher::ConnectCallback callback_;
+};
+
+}  // namespace
+
+void ServicePortDispatcherImpl::Create(
+    base::WeakPtr<blink::WebServiceWorkerContextProxy> proxy,
+    mojo::InterfaceRequest<ServicePortDispatcher> request) {
+  new ServicePortDispatcherImpl(proxy, request.Pass());
+}
+
+ServicePortDispatcherImpl::~ServicePortDispatcherImpl() {
+  WorkerTaskRunner::Instance()->RemoveStopObserver(this);
+}
+
+ServicePortDispatcherImpl::ServicePortDispatcherImpl(
+    base::WeakPtr<blink::WebServiceWorkerContextProxy> proxy,
+    mojo::InterfaceRequest<ServicePortDispatcher> request)
+    : binding_(this, request.Pass()), proxy_(proxy) {
+  WorkerTaskRunner::Instance()->AddStopObserver(this);
+}
+
+void ServicePortDispatcherImpl::OnWorkerRunLoopStopped() {
+  delete this;
+}
+
+void ServicePortDispatcherImpl::Connect(const mojo::String& target_url,
+                                        const mojo::String& origin,
+                                        int32_t port_id,
+                                        const ConnectCallback& callback) {
+  if (!proxy_) {
+    callback.Run(SERVICE_PORT_CONNECT_RESULT_REJECT, mojo::String(""),
+                 mojo::String(""));
+    return;
+  }
+  TRACE_EVENT0("ServiceWorker", "ServicePortDispatcherImpl::Connect");
+  proxy_->dispatchServicePortConnectEvent(new ConnectCallbacks(callback),
+                                          target_url.To<GURL>(),
+                                          origin.To<base::string16>(), port_id);
+}
+
+}  // namespace content