Renable WebViewTest.GeolocationAPIEmbedderHasAccessMultipleBridgeIdAllow with fixes.

content/browser/geolocation/geolocation_provider_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/geolocation_provider_impl.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/location.h"
@@ skipping 33 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   bool was_permission_granted = user_did_opt_into_location_services_;
   user_did_opt_into_location_services_ = true;
   if (IsRunning() && !was_permission_granted)
     InformProvidersPermissionGranted();
 }
 
 void GeolocationProviderImpl::OverrideLocationForTesting(
     const Geoposition& position) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  position_ = position;
   ignore_location_updates_ = true;
   NotifyClients(position);
 }
 
 void GeolocationProviderImpl::OnLocationUpdate(const Geoposition& position) {
   DCHECK(OnGeolocationThread());
   // Will be true only in testing.
   if (ignore_location_updates_)
     return;
   BrowserThread::PostTask(BrowserThread::UI,
@@ skipping 28 matching lines @@
 
 bool GeolocationProviderImpl::OnGeolocationThread() const {
   return base::MessageLoop::current() == message_loop();
 }
 
 void GeolocationProviderImpl::OnClientsChanged() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   base::Closure task;
   if (high_accuracy_callbacks_.empty() && low_accuracy_callbacks_.empty()) {
     DCHECK(IsRunning());
-    // We have no more observers, so we clear the cached geoposition so that
-    // when the next observer is added we will not provide a stale position.
-    position_ = Geoposition();
+    if (!ignore_location_updates_) {
+      // We have no more observers, so we clear the cached geoposition so that
+      // when the next observer is added we will not provide a stale position.
+      position_ = Geoposition();
+    }
     task = base::Bind(&GeolocationProviderImpl::StopProviders,
                       base::Unretained(this));
   } else {
     if (!IsRunning()) {
       Start();
       if (user_did_opt_into_location_services_)
         InformProvidersPermissionGranted();
     }
     // Determine a set of options that satisfies all clients.
     bool use_high_accuracy = !high_accuracy_callbacks_.empty();
@@ skipping 54 matching lines @@
   arbitrator_ = NULL;
 }
 
 LocationArbitrator* GeolocationProviderImpl::CreateArbitrator() {
   LocationArbitratorImpl::LocationUpdateCallback callback = base::Bind(
       &GeolocationProviderImpl::OnLocationUpdate, base::Unretained(this));
   return new LocationArbitratorImpl(callback);
 }
 
 }  // namespace content