ServiceWorker: Mojofication of ServiceWorkerDispatcherHost

content/browser/service_worker/service_worker_dispatcher_host.h

 // Copyright 2013 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.
 
 #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_DISPATCHER_HOST_H_
 #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_DISPATCHER_HOST_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <vector>
 
 #include "base/id_map.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "content/browser/service_worker/service_worker_registration_status.h"
+#include "content/common/service_worker/service_worker.mojom.h"
 #include "content/common/service_worker/service_worker_types.h"
 #include "content/public/browser/browser_message_filter.h"
+#include "mojo/public/cpp/bindings/associated_binding_set.h"
 
 class GURL;
 struct EmbeddedWorkerHostMsg_ReportConsoleMessage_Params;
 
 namespace url {
 class Origin;
 }
 
 namespace content {
 
 class MessagePortMessageFilter;
 class ResourceContext;
 class ServiceWorkerContextCore;
 class ServiceWorkerContextWrapper;
 class ServiceWorkerHandle;
 class ServiceWorkerProviderHost;
 class ServiceWorkerRegistration;
 class ServiceWorkerRegistrationHandle;
 class ServiceWorkerVersion;
 struct ServiceWorkerObjectInfo;
 struct ServiceWorkerRegistrationInfo;
 struct ServiceWorkerRegistrationObjectInfo;
 struct ServiceWorkerVersionAttributes;
 
-class CONTENT_EXPORT ServiceWorkerDispatcherHost : public BrowserMessageFilter {
+class CONTENT_EXPORT ServiceWorkerDispatcherHost
+    : public mojom::ServiceWorkerDispatcherHost,

[horo, 2016/10/07 07:39:29]

I think you can use BrowserAssociatedInterface.

[shimazu, 2016/10/14 08:15:03]

BrowserAssociatedInterface assume that the object inheriting
BrowserAssociatedInterface has 1:1 relation to the pointer.
(BrowserAssociatedInterface uses AssociatedBinding), so I implemented as this
(for using AssociatedBindingSet).

+      public BrowserMessageFilter {
  public:
   ServiceWorkerDispatcherHost(
       int render_process_id,
       MessagePortMessageFilter* message_port_message_filter,
       ResourceContext* resource_context);
 
   void Init(ServiceWorkerContextWrapper* context_wrapper);
 
   // BrowserMessageFilter implementation
   void OnFilterAdded(IPC::Channel* channel) override;
   void OnFilterRemoved() override;
   void OnDestruct() const override;
   bool OnMessageReceived(const IPC::Message& message) override;
 
+  // Called when mojom::ServiceWorkerDispatcherHostPtr is created on the
+  // renderer-side.
+  void AddMojoBinding(mojo::ScopedInterfaceEndpointHandle handle);

[horo, 2016/10/07 07:39:29]

Move to private.

[shimazu, 2016/10/14 08:15:03]

Done.

+
   // IPC::Sender implementation
 
   // Send() queues the message until the underlying sender is ready.  This
   // class assumes that Send() can only fail after that when the renderer
   // process has terminated, at which point the whole instance will eventually
   // be destroyed.
   bool Send(IPC::Message* message) override;
 
   void RegisterServiceWorkerHandle(std::unique_ptr<ServiceWorkerHandle> handle);
   void RegisterServiceWorkerRegistrationHandle(
       std::unique_ptr<ServiceWorkerRegistrationHandle> handle);
 
   ServiceWorkerHandle* FindServiceWorkerHandle(int provider_id,
                                                int64_t version_id);
 
   // Returns the existing registration handle whose reference count is
   // incremented or a newly created one if it doesn't exist.
   ServiceWorkerRegistrationHandle* GetOrCreateRegistrationHandle(
       base::WeakPtr<ServiceWorkerProviderHost> provider_host,
       ServiceWorkerRegistration* registration);
 
   MessagePortMessageFilter* message_port_message_filter() {
     return message_port_message_filter_;
   }
 
+  base::WeakPtr<ServiceWorkerDispatcherHost> GetWeakPtr() {
+    return weak_factory_.GetWeakPtr();
+  }
+
  protected:
   ~ServiceWorkerDispatcherHost() override;
 
  private:
   friend class BrowserThread;
   friend class base::DeleteHelper<ServiceWorkerDispatcherHost>;
   friend class ServiceWorkerDispatcherHostTest;
   friend class TestingServiceWorkerDispatcherHost;
 
   using StatusCallback = base::Callback<void(ServiceWorkerStatusCode status)>;
 
+  // mojom::ServiceWorkerDispatcherHost implementation
+  void OnProviderCreated(int provider_id,
+                         int route_id,
+                         ServiceWorkerProviderType provider_type,
+                         bool is_parent_frame_secure) override;
+
   // IPC Message handlers
   void OnRegisterServiceWorker(int thread_id,
                                int request_id,
                                int provider_id,
                                const GURL& pattern,
                                const GURL& script_url);
   void OnUpdateServiceWorker(int thread_id,
                              int request_id,
                              int provider_id,
                              int64_t registration_id);
   void OnUnregisterServiceWorker(int thread_id,
                                  int request_id,
                                  int provider_id,
                                  int64_t registration_id);
   void OnGetRegistration(int thread_id,
                          int request_id,
                          int provider_id,
                          const GURL& document_url);
   void OnGetRegistrations(int thread_id, int request_id, int provider_id);
   void OnGetRegistrationForReady(int thread_id,
                                  int request_id,
                                  int provider_id);
-  void OnProviderCreated(int provider_id,
-                         int route_id,
-                         ServiceWorkerProviderType provider_type,
-                         bool is_parent_frame_secure);
   void OnProviderDestroyed(int provider_id);
   void OnSetHostedVersionId(int provider_id,
                             int64_t version_id,
                             int embedded_worker_id);
   void OnWorkerReadyForInspection(int embedded_worker_id);
   void OnWorkerScriptLoaded(int embedded_worker_id);
   void OnWorkerThreadStarted(int embedded_worker_id,
                              int thread_id,
                              int provider_id);
   void OnWorkerScriptLoadFailed(int embedded_worker_id);
@@ skipping 105 matching lines @@
 
   IDMap<ServiceWorkerHandle, IDMapOwnPointer> handles_;
 
   using RegistrationHandleMap =
       IDMap<ServiceWorkerRegistrationHandle, IDMapOwnPointer>;
   RegistrationHandleMap registration_handles_;
 
   bool channel_ready_;  // True after BrowserMessageFilter::sender_ != NULL.
   std::vector<std::unique_ptr<IPC::Message>> pending_messages_;
 
+  mojo::AssociatedBindingSet<mojom::ServiceWorkerDispatcherHost> bindings_;
+
+  base::WeakPtrFactory<ServiceWorkerDispatcherHost> weak_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(ServiceWorkerDispatcherHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_DISPATCHER_HOST_H_