Do not send stale position in GeolocationProvider::AddObserver.

content/browser/geolocation/geolocation_provider.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/geolocation_provider.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop.h"
 #include "content/browser/geolocation/location_arbitrator.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace content {
 
 void GeolocationProvider::AddObserver(GeolocationObserver* observer,
     const GeolocationObserverOptions& update_options) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   observers_[observer] = update_options;
   OnClientsChanged();
-  if (position_.Validate() ||
-      position_.error_code != Geoposition::ERROR_CODE_NONE)
-    observer->OnLocationUpdate(position_);
+  if (ignore_location_updates_) {
+    // Position has been overridden for testing. Tests expect the observers to
+    // be called synchronously in this case.
+    if (position_.Validate() ||
+        position_.error_code != Geoposition::ERROR_CODE_NONE)
+      observer->OnLocationUpdate(position_);

[John Knottenbelt, 2012/11/18 16:03:07]

We don't want to send this if we're the first observer, as we'll want to take a
fresh fix. But if we're not the first then we want to send the most recent fresh
position we have. When the last observer unregisters, we should clear this
cached position.

+  }
 }
 
 bool GeolocationProvider::RemoveObserver(GeolocationObserver* observer) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   size_t removed = observers_.erase(observer);
   if (removed)
     OnClientsChanged();
   return removed > 0;
 }
 
@@ skipping 149 matching lines @@
   arbitrator_ = GeolocationArbitrator::Create(this);
 }
 
 void GeolocationProvider::CleanUp() {
   DCHECK(OnGeolocationThread());
   delete arbitrator_;
   arbitrator_ = NULL;
 }
 
 }  // namespace content