Change RunAfterStartWorker to not start the worker if it is already running.

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"
@@ skipping 377 matching lines @@
   }
 
   ServiceWorkerVersion* active_version =
       service_worker_registration->active_version();
   DCHECK(active_version);
 
   // Hold on to the service worker registration in the callback to keep it alive
   // until the callback dies. Otherwise the registration could be released when
   // this method returns - before the event is delivered to the service worker.
   active_version->RunAfterStartWorker(
-      base::Bind(&GeofencingManager::OnEventError, this),
       base::Bind(&GeofencingManager::DeliverEventToRunningWorker, this,
                  service_worker_registration, event_type,
                  registration->region_id, registration->region,
-                 make_scoped_refptr(active_version)));
+                 make_scoped_refptr(active_version)),
+      base::Bind(&GeofencingManager::OnEventError, this));
 }
 
 void GeofencingManager::DeliverEventToRunningWorker(
     const scoped_refptr<ServiceWorkerRegistration>& service_worker_registration,
     blink::WebGeofencingEventType event_type,
     const std::string& region_id,
     const blink::WebCircularGeofencingRegion& region,
     const scoped_refptr<ServiceWorkerVersion>& worker) {
   int request_id =
       worker->StartRequest(ServiceWorkerMetrics::EventType::GEOFENCING,
@@ skipping 18 matching lines @@
   // TODO(mek): log/check result.
 }
 
 void GeofencingManager::OnEventError(
     ServiceWorkerStatusCode service_worker_status) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   // TODO(mek): log/check errors.
 }
 
 }  // namespace content