Reapply geolocation network protocol changes.

content/browser/geolocation/location_arbitrator.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.h"
 
 #include <map>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "content/browser/geolocation/arbitrator_dependency_factory.h"
 #include "content/public/browser/access_token_store.h"
 #include "googleurl/src/gurl.h"
 
 using content::AccessTokenStore;
 using content::Geoposition;
 
 namespace {
 
-const char* kDefaultNetworkProviderUrl = "https://maps.googleapis.com/maps/api/browserlocation/json";
+const char* kDefaultNetworkProviderUrl =
+    "https://www.googleapis.com/geolocation/v1/geolocate";
 GeolocationArbitratorDependencyFactory* g_dependency_factory_for_test = NULL;
 
 }  // namespace
 
 // To avoid oscillations, set this to twice the expected update interval of a
 // a GPS-type location provider (in case it misses a beat) plus a little.
 const int64 GeolocationArbitrator::kFixStaleTimeoutMilliseconds =
     11 * base::Time::kMillisecondsPerSecond;
 
 GeolocationArbitrator::GeolocationArbitrator(
@@ skipping 16 matching lines @@
   GeolocationArbitratorDependencyFactory* dependency_factory =
       g_dependency_factory_for_test ?
       g_dependency_factory_for_test :
       new DefaultGeolocationArbitratorDependencyFactory;
   GeolocationArbitrator* arbitrator =
       new GeolocationArbitrator(dependency_factory, observer);
   g_dependency_factory_for_test = NULL;
   return arbitrator;
 }
 
+GURL GeolocationArbitrator::DefaultNetworkProviderURL() {
+  return GURL(kDefaultNetworkProviderUrl);
+}
+
 void GeolocationArbitrator::OnPermissionGranted() {
   is_permission_granted_ = true;
   for (ScopedVector<LocationProviderBase>::iterator i = providers_.begin();
       i != providers_.end(); ++i) {
     (*i)->OnPermissionGranted();
   }
 }
 
 void GeolocationArbitrator::StartProviders(
     const GeolocationObserverOptions& options) {
   // Stash options as OnAccessTokenStoresLoaded has not yet been called.
   current_provider_options_ = options;
   if (providers_.empty()) {
-    DCHECK(GURL(kDefaultNetworkProviderUrl).is_valid());
+    DCHECK(DefaultNetworkProviderURL().is_valid());
     access_token_store_->LoadAccessTokens(
         base::Bind(&GeolocationArbitrator::OnAccessTokenStoresLoaded,
                    base::Unretained(this)));
   } else {
     DoStartProviders();
   }
 }
 
 void GeolocationArbitrator::DoStartProviders() {
   for (ScopedVector<LocationProviderBase>::iterator i = providers_.begin();
        i != providers_.end(); ++i) {
     (*i)->StartProvider(current_provider_options_.use_high_accuracy);
   }
 }
 
 void GeolocationArbitrator::StopProviders() {
   providers_.clear();
 }
 
 void GeolocationArbitrator::OnAccessTokenStoresLoaded(
     AccessTokenStore::AccessTokenSet access_token_set,
     net::URLRequestContextGetter* context_getter) {
   if (!providers_.empty()) {
     // A second StartProviders() call may have arrived before the first
     // completed.
     return;
   }
   // If there are no access tokens, boot strap it with the default server URL.
   if (access_token_set.empty())
-    access_token_set[GURL(kDefaultNetworkProviderUrl)];
+    access_token_set[DefaultNetworkProviderURL()];
   for (AccessTokenStore::AccessTokenSet::iterator i =
            access_token_set.begin();
       i != access_token_set.end(); ++i) {
     RegisterProvider(
         dependency_factory_->NewNetworkLocationProvider(
             access_token_store_.get(), context_getter,
             i->first, i->second));
   }
   RegisterProvider(dependency_factory_->NewSystemLocationProvider());
   DoStartProviders();
@@ skipping 51 matching lines @@
 }
 
 bool GeolocationArbitrator::HasPermissionBeenGranted() const {
   return is_permission_granted_;
 }
 
 void GeolocationArbitrator::SetDependencyFactoryForTest(
     GeolocationArbitratorDependencyFactory* dependency_factory) {
   g_dependency_factory_for_test = dependency_factory;
 }