ServiceWorker: Mojofication of EWInstance::StopWorker

content/renderer/service_worker/embedded_worker_instance_client_impl.h

Index: content/renderer/service_worker/embedded_worker_instance_client_impl.h
diff --git a/content/renderer/service_worker/embedded_worker_instance_client_impl.h b/content/renderer/service_worker/embedded_worker_instance_client_impl.h
index c17f311d8b5fc0545d43f04ff02a8f6f1b672e6f..e578aa25d362e6482d9c81882845b34d40b0a3bf 100644
--- a/content/renderer/service_worker/embedded_worker_instance_client_impl.h
+++ b/content/renderer/service_worker/embedded_worker_instance_client_impl.h
@@ -6,9 +6,10 @@
 #define CONTENT_RENDERER_SERVICE_WORKER_EMBEDDED_WORKER_INSTANCE_CLIENT_IMPL_H_
 
 #include "base/id_map.h"
+#include "base/optional.h"
 #include "content/common/service_worker/embedded_worker.mojom.h"
 #include "content/renderer/service_worker/embedded_worker_dispatcher.h"
-#include "mojo/public/cpp/bindings/strong_binding.h"
+#include "mojo/public/cpp/bindings/binding.h"
 
 namespace content {
 
@@ -19,22 +20,36 @@ class EmbeddedWorkerInstanceClientImpl
       EmbeddedWorkerDispatcher* dispatcher,
       mojo::InterfaceRequest<mojom::EmbeddedWorkerInstanceClient> request);
 
-  // Implementation of mojo interface
-  void StartWorker(const EmbeddedWorkerStartParams& params) override;
-
- private:
   EmbeddedWorkerInstanceClientImpl(
       EmbeddedWorkerDispatcher* dispatcher,
       mojo::InterfaceRequest<mojom::EmbeddedWorkerInstanceClient> request);
   ~EmbeddedWorkerInstanceClientImpl() override;
 
+  // Called from ServiceWorkerContextClient. Must call on the main thread.
+  void StopWorkerCompleted();
+
+ private:
+  // Implementation of mojo interface

[dcheng, 2016/09/30 08:25:28]

Nit: This is usually worded as:
// mojom::EmbeddedWorkerInstanceClient implementation:

(It's nice to refer to the exact type, sinceit's possible for one interface to
implement multiple mojo bindings)

[shimazu, 2016/10/06 03:50:51]

Done.

+  void StartWorker(const EmbeddedWorkerStartParams& params) override;
+  void StopWorker(const StopWorkerCallback& callback) override;
+
+  // Handler of connection error bound to |binding_|
   void OnError();
 
   EmbeddedWorkerDispatcher* dispatcher_;
-  mojo::StrongBinding<mojom::EmbeddedWorkerInstanceClient> binding_;
+  // This object will be bound to the main thread.
+  mojo::Binding<mojom::EmbeddedWorkerInstanceClient> binding_;
 
+  // This is valid before StartWorker is called. After that, this object
+  // will be passed to ServiceWorkerContextClient.
+  std::unique_ptr<EmbeddedWorkerInstanceClientImpl> temporal_self_;

[dcheng, 2016/09/30 08:25:28]

This is a bit too clever. Let me try to think if there is a better way...

[shimazu, 2016/10/06 03:50:51]

I think this is needed because currently no browser-side param can be passed to
the constructor (Create). If it's solved, I can remove this by passing a
EmbeddedWorkerStartParams to Create() and launching the worker at the same time.

+
+  base::Optional<int> embedded_worker_id_;
   EmbeddedWorkerDispatcher::WorkerWrapper* wrapper_;
 
+  // Stores callbacks
+  StopWorkerCallback stop_callback_;
+
   DISALLOW_COPY_AND_ASSIGN(EmbeddedWorkerInstanceClientImpl);
 };