Reapply geolocation network protocol changes.

content/browser/geolocation/location_arbitrator.cc

Index: content/browser/geolocation/location_arbitrator.cc
===================================================================
--- content/browser/geolocation/location_arbitrator.cc	(revision 162123)
+++ content/browser/geolocation/location_arbitrator.cc	(working copy)
@@ -17,7 +17,8 @@
 
 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
@@ -54,6 +55,10 @@
   return arbitrator;
 }
 
+GURL GeolocationArbitrator::DefaultNetworkProviderURL() {
+  return GURL(kDefaultNetworkProviderUrl);
+}
+
 void GeolocationArbitrator::OnPermissionGranted() {
   is_permission_granted_ = true;
   for (ScopedVector<LocationProviderBase>::iterator i = providers_.begin();
@@ -67,7 +72,7 @@
   // 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)));
@@ -97,7 +102,7 @@
   }
   // 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) {