Refactor GeofencingManager to have one instance per StoragePartition.

content/browser/geofencing/geofencing_dispatcher_host.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_dispatcher_host.h"
 
 #include "content/browser/geofencing/geofencing_manager.h"
 #include "content/common/geofencing_messages.h"
 #include "third_party/WebKit/public/platform/WebCircularGeofencingRegion.h"
-#include "url/gurl.h"
 
 namespace content {
 
 static const int kMaxRegionIdLength = 200;
 
 GeofencingDispatcherHost::GeofencingDispatcherHost(
-    BrowserContext* browser_context)
+    GeofencingManager* geofencing_manager)
     : BrowserMessageFilter(GeofencingMsgStart),
-      browser_context_(browser_context),
+      manager_(geofencing_manager),
       weak_factory_(this) {
 }
 
 GeofencingDispatcherHost::~GeofencingDispatcherHost() {
 }
 
 bool GeofencingDispatcherHost::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(GeofencingDispatcherHost, message)
   IPC_MESSAGE_HANDLER(GeofencingHostMsg_RegisterRegion, OnRegisterRegion)
@@ skipping 10 matching lines @@
     int request_id,
     const std::string& region_id,
     const blink::WebCircularGeofencingRegion& region) {
   // Sanity check on region_id
   if (region_id.length() > kMaxRegionIdLength) {
     Send(new GeofencingMsg_RegisterRegionComplete(
         thread_id, request_id, GeofencingStatus::GEOFENCING_STATUS_ERROR));
     return;
   }
   // TODO(mek): Actually pass service worker information to manager.
-  GeofencingManager::GetInstance()->RegisterRegion(
-      browser_context_,
-      0,      /* service_worker_registration_id */
-      GURL(), /* service_worker_origin */
+  manager_->RegisterRegion(
+      0, /* service_worker_registration_id */
       region_id,
       region,
       base::Bind(&GeofencingDispatcherHost::RegisterRegionCompleted,
                  weak_factory_.GetWeakPtr(),
                  thread_id,
                  request_id));
 }
 
 void GeofencingDispatcherHost::OnUnregisterRegion(
     int thread_id,
     int request_id,
     const std::string& region_id) {
   // Sanity check on region_id
   if (region_id.length() > kMaxRegionIdLength) {
     Send(new GeofencingMsg_UnregisterRegionComplete(
         thread_id, request_id, GeofencingStatus::GEOFENCING_STATUS_ERROR));
     return;
   }
   // TODO(mek): Actually pass service worker information to manager.
-  GeofencingManager::GetInstance()->UnregisterRegion(
-      browser_context_,
-      0,      /* service_worker_registration_id */
-      GURL(), /* service_worker_origin */
+  manager_->UnregisterRegion(
+      0, /* service_worker_registration_id */
       region_id,
       base::Bind(&GeofencingDispatcherHost::UnregisterRegionCompleted,
                  weak_factory_.GetWeakPtr(),
                  thread_id,
                  request_id));
 }
 
 void GeofencingDispatcherHost::OnGetRegisteredRegions(int thread_id,
                                                       int request_id) {
   GeofencingRegistrations result;
   // TODO(mek): Actually pass service worker information to manager.
   GeofencingStatus status =
-      GeofencingManager::GetInstance()->GetRegisteredRegions(
-          browser_context_,
-          0,      /* service_worker_registration_id */
-          GURL(), /* service_worker_origin */
-          &result);
+      manager_->GetRegisteredRegions(0, /* service_worker_registration_id */
+                                     &result);
   Send(new GeofencingMsg_GetRegisteredRegionsComplete(
       thread_id, request_id, status, result));
 }
 
 void GeofencingDispatcherHost::RegisterRegionCompleted(
     int thread_id,
     int request_id,
     GeofencingStatus status) {
   Send(new GeofencingMsg_RegisterRegionComplete(thread_id, request_id, status));
 }
 
 void GeofencingDispatcherHost::UnregisterRegionCompleted(
     int thread_id,
     int request_id,
     GeofencingStatus status) {
   Send(new GeofencingMsg_UnregisterRegionComplete(
       thread_id, request_id, status));
 }
 
 }  // namespace content