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

content/browser/geofencing/geofencing_manager.cc

 // Copyright 2014 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/browser/geofencing/geofencing_manager.h"
 
 #include <algorithm>
 
 #include "base/callback.h"
 #include "content/browser/geofencing/geofencing_service.h"
 #include "content/browser/service_worker/service_worker_context_wrapper.h"
 #include "content/public/browser/browser_thread.h"
 #include "third_party/WebKit/public/platform/WebCircularGeofencingRegion.h"
 
 namespace content {
 
 struct GeofencingManager::Registration {
   Registration(int64 service_worker_registration_id,
+               const GURL& service_worker_origin,
                const std::string& region_id,
                const blink::WebCircularGeofencingRegion& region,
                const StatusCallback& callback,
                int64 geofencing_registration_id);
 
   int64 service_worker_registration_id;
+  GURL service_worker_origin;
   std::string region_id;
   blink::WebCircularGeofencingRegion region;
 
   // Registration ID as returned by the |GeofencingService|.
   int64 geofencing_registration_id;
 
   // Callback to call when registration is completed. This field is reset when
   // registration is complete.
   StatusCallback registration_callback;
 
   // Returns true if registration has been completed, and thus should be
   // included in calls to GetRegisteredRegions.
   bool is_active() const { return registration_callback.is_null(); }
 };
 
 GeofencingManager::Registration::Registration(
     int64 service_worker_registration_id,
+    const GURL& service_worker_origin,
     const std::string& region_id,
     const blink::WebCircularGeofencingRegion& region,
     const GeofencingManager::StatusCallback& callback,
     int64 geofencing_registration_id)
     : service_worker_registration_id(service_worker_registration_id),
       region_id(region_id),
       region(region),
       geofencing_registration_id(geofencing_registration_id),
       registration_callback(callback) {
 }
@@ skipping 36 matching lines @@
 
 void GeofencingManager::RegisterRegion(
     int64 service_worker_registration_id,
     const std::string& region_id,
     const blink::WebCircularGeofencingRegion& region,
     const StatusCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   // TODO(mek): Validate region_id and region.
 
+  // Look up service worker. In unit tests |service_worker_context_| might not
+  // be set.
+  GURL service_worker_origin;
+  if (service_worker_context_.get()) {
+    ServiceWorkerRegistration* service_worker_registration =
+        service_worker_context_->context()->GetLiveRegistration(
+            service_worker_registration_id);
+    if (!service_worker_registration) {
+      callback.Run(GEOFENCING_STATUS_OPERATION_FAILED_NO_SERVICE_WORKER);
+      return;
+    }
+
+    service_worker_origin = service_worker_registration->pattern().GetOrigin();
+  }
+
   if (!service_->IsServiceAvailable()) {
     callback.Run(GEOFENCING_STATUS_OPERATION_FAILED_SERVICE_NOT_AVAILABLE);
     return;
   }
 
   if (FindRegistration(service_worker_registration_id, region_id)) {
     // Already registered, return an error.
     callback.Run(GEOFENCING_STATUS_ERROR);
     return;
   }
 
   AddRegistration(service_worker_registration_id,
+                  service_worker_origin,
                   region_id,
                   region,
                   callback,
                   service_->RegisterRegion(region, this));
 }
 
 void GeofencingManager::UnregisterRegion(int64 service_worker_registration_id,
                                          const std::string& region_id,
                                          const StatusCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   // TODO(mek): Validate region_id.
 
+  // Look up service worker. In unit tests |service_worker_context_| might not
+  // be set.
+  if (service_worker_context_.get()) {
+    ServiceWorkerRegistration* service_worker_registration =
+        service_worker_context_->context()->GetLiveRegistration(
+            service_worker_registration_id);
+    if (!service_worker_registration) {
+      callback.Run(GEOFENCING_STATUS_OPERATION_FAILED_NO_SERVICE_WORKER);
+      return;
+    }
+  }
+
   if (!service_->IsServiceAvailable()) {
     callback.Run(GEOFENCING_STATUS_OPERATION_FAILED_SERVICE_NOT_AVAILABLE);
     return;
   }
 
   Registration* registration =
       FindRegistration(service_worker_registration_id, region_id);
   if (!registration) {
     // Not registered, return an error.
     callback.Run(GEOFENCING_STATUS_ERROR);
@@ skipping 10 matching lines @@
   ClearRegistration(registration);
   callback.Run(GEOFENCING_STATUS_OK);
 }
 
 GeofencingStatus GeofencingManager::GetRegisteredRegions(
     int64 service_worker_registration_id,
     std::map<std::string, blink::WebCircularGeofencingRegion>* result) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   CHECK(result);
 
+  // Look up service worker. In unit tests |service_worker_context_| might not
+  // be set.
+  if (service_worker_context_.get()) {
+    ServiceWorkerRegistration* service_worker_registration =
+        service_worker_context_->context()->GetLiveRegistration(
+            service_worker_registration_id);
+    if (!service_worker_registration) {
+      return GEOFENCING_STATUS_OPERATION_FAILED_NO_SERVICE_WORKER;
+    }
+  }
+
   if (!service_->IsServiceAvailable()) {
     return GEOFENCING_STATUS_OPERATION_FAILED_SERVICE_NOT_AVAILABLE;
   }
 
   // Populate result, filtering out inactive registrations.
   result->clear();
   ServiceWorkerRegistrationsMap::iterator registrations =
       registrations_.find(service_worker_registration_id);
   if (registrations == registrations_.end())
     return GEOFENCING_STATUS_OK;
@@ skipping 38 matching lines @@
     int64 geofencing_registration_id) {
   RegistrationIdRegistrationMap::iterator registration_iterator =
       registrations_by_id_.find(geofencing_registration_id);
   if (registration_iterator == registrations_by_id_.end())
     return nullptr;
   return &registration_iterator->second->second;
 }
 
 GeofencingManager::Registration& GeofencingManager::AddRegistration(
     int64 service_worker_registration_id,
+    const GURL& service_worker_origin,
     const std::string& region_id,
     const blink::WebCircularGeofencingRegion& region,
     const StatusCallback& callback,
     int64 geofencing_registration_id) {
   DCHECK(!FindRegistration(service_worker_registration_id, region_id));
   RegionIdRegistrationMap::iterator registration =
       registrations_[service_worker_registration_id]
           .insert(std::make_pair(region_id,
                                  Registration(service_worker_registration_id,
+                                              service_worker_origin,
                                               region_id,
                                               region,
                                               callback,
                                               geofencing_registration_id)))
           .first;
   registrations_by_id_[geofencing_registration_id] = registration;
   return registration->second;
 }
 
 void GeofencingManager::ClearRegistration(Registration* registration) {
   registrations_by_id_.erase(registration->geofencing_registration_id);
   ServiceWorkerRegistrationsMap::iterator registrations_iterator =
       registrations_.find(registration->service_worker_registration_id);
   DCHECK(registrations_iterator != registrations_.end());
   registrations_iterator->second.erase(registration->region_id);
   if (registrations_iterator->second.empty())
     registrations_.erase(registrations_iterator);
 }
 
 }  // namespace content