Clear Reference Location State When Providers are Stopped

content/browser/geolocation/location_arbitrator_impl.cc

 // Copyright (c) 2012 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/geolocation/location_arbitrator_impl.h"
 
 #include <map>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 52 matching lines @@
 }
 
 void GeolocationArbitratorImpl::DoStartProviders() {
   for (ScopedVector<LocationProviderBase>::iterator i = providers_.begin();
        i != providers_.end(); ++i) {
     (*i)->StartProvider(use_high_accuracy_);
   }
 }
 
 void GeolocationArbitratorImpl::StopProviders() {
+  // Reset the reference location state (provider+position)
+  // so that future starts use fresh locations from
+  // the newly constructed providers.
+  position_provider_ = NULL;
+  position_ = Geoposition();
+
   providers_.clear();
   is_running_ = false;
 }
 
 void GeolocationArbitratorImpl::OnAccessTokenStoresLoaded(
     AccessTokenStore::AccessTokenSet access_token_set,
     net::URLRequestContextGetter* context_getter) {
   if (!is_running_ || !providers_.empty()) {
     // A second StartProviders() call may have arrived before the first
     // completed.
@@ skipping 95 matching lines @@
     }
   }
   return false;
 }
 
 bool GeolocationArbitratorImpl::HasPermissionBeenGranted() const {
   return is_permission_granted_;
 }
 
 }  // namespace content