Chrome side of passing on the service worker registration with geofencing API calls.

content/browser/geofencing/geofencing_dispatcher_host.h

Index: content/browser/geofencing/geofencing_dispatcher_host.h
diff --git a/content/browser/geofencing/geofencing_dispatcher_host.h b/content/browser/geofencing/geofencing_dispatcher_host.h
index e7ef84311930f0c20f13999ea4adaf32c20161d7..e90de1cc4f22b0d2a43437f996a5c03002b22660 100644
--- a/content/browser/geofencing/geofencing_dispatcher_host.h
+++ b/content/browser/geofencing/geofencing_dispatcher_host.h
@@ -15,10 +15,13 @@ struct WebCircularGeofencingRegion;
 namespace content {
 
 class BrowserContext;
+class ServiceWorkerDispatcherHost;
 
 class GeofencingDispatcherHost : public BrowserMessageFilter {
  public:
-  explicit GeofencingDispatcherHost(BrowserContext* browser_context);
+  GeofencingDispatcherHost(
+      BrowserContext* browser_context,
+      scoped_refptr<ServiceWorkerDispatcherHost> service_worker_filter);
 
  private:
   virtual ~GeofencingDispatcherHost();
@@ -29,11 +32,15 @@ class GeofencingDispatcherHost : public BrowserMessageFilter {
   void OnRegisterRegion(int thread_id,
                         int request_id,
                         const std::string& region_id,
-                        const blink::WebCircularGeofencingRegion& region);
+                        const blink::WebCircularGeofencingRegion& region,
+                        int service_worker_registration_handle_id);
   void OnUnregisterRegion(int thread_id,
                           int request_id,
-                          const std::string& region_id);
-  void OnGetRegisteredRegions(int thread_id, int request_id);
+                          const std::string& region_id,
+                          int service_worker_registration_handle_id);
+  void OnGetRegisteredRegions(int thread_id,
+                              int request_id,
+                              int service_worker_registration_handle_id);
 
   void RegisterRegionCompleted(int thread_id,
                                int request_id,
@@ -43,6 +50,7 @@ class GeofencingDispatcherHost : public BrowserMessageFilter {
                                  GeofencingStatus result);
 
   BrowserContext* browser_context_;
+  scoped_refptr<ServiceWorkerDispatcherHost> service_worker_filter_;

[Michael van Ouwerkerk, 2014/10/09 12:28:09]

It seems strange for one filter to have a pointer to another filter. Is there no
better API to interact with the service worker system?

[Marijn Kruisselbrink, 2014/10/09 22:28:58]

That's the question, yes.

   base::WeakPtrFactory<GeofencingDispatcherHost> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GeofencingDispatcherHost);