Refactor to make BlimpLocationProvider accessible to content layer.

content/browser/geolocation/location_arbitrator_impl.cc

Index: content/browser/geolocation/location_arbitrator_impl.cc
diff --git a/content/browser/geolocation/location_arbitrator_impl.cc b/content/browser/geolocation/location_arbitrator_impl.cc
index d6cb78b1657aa34b3567a864563d71f8477ceffb..75a27973e229ba2bee67bacdbc4cc64bc720f672 100644
--- a/content/browser/geolocation/location_arbitrator_impl.cc
+++ b/content/browser/geolocation/location_arbitrator_impl.cc
@@ -52,31 +52,37 @@ void LocationArbitratorImpl::OnPermissionGranted() {
 }
 
 void LocationArbitratorImpl::StartProviders(bool enable_high_accuracy) {
-  // GetAccessTokenStore() will return NULL for embedders not implementing
-  // the AccessTokenStore class, so we report an error to avoid JavaScript
-  // requests of location to wait eternally for a reply.
-  AccessTokenStore* access_token_store = GetAccessTokenStore();
-  if (!access_token_store) {
-    Geoposition position;
-    position.error_code = Geoposition::ERROR_CODE_PERMISSION_DENIED;
-    arbitrator_update_callback_.Run(position);
-    return;
-  }
-
   // Stash options as OnAccessTokenStoresLoaded has not yet been called.
   is_running_ = true;
   enable_high_accuracy_ = enable_high_accuracy;
+
   if (providers_.empty()) {
-    DCHECK(DefaultNetworkProviderURL().is_valid());
-    access_token_store->LoadAccessTokens(
-        base::Bind(&LocationArbitratorImpl::OnAccessTokenStoresLoaded,
-                   base::Unretained(this)));
-  } else {
-    DoStartProviders();
+    RegisterSystemProvider();
+
+    AccessTokenStore* access_token_store = GetAccessTokenStore();
+    if (access_token_store &&
+        GetContentClient()->browser()->UseNetworkLocationProviders()) {
+      DCHECK(DefaultNetworkProviderURL().is_valid());
+      token_store_callback_.Reset(
+          base::Bind(&LocationArbitratorImpl::OnAccessTokenStoresLoaded,
+                     base::Unretained(this)));
+      access_token_store->LoadAccessTokens(token_store_callback_.callback());
+      return;
+    }
   }
+  DoStartProviders();
 }
 
 void LocationArbitratorImpl::DoStartProviders() {
+  if (providers_.empty()) {
+    // GetAccessTokenStore() will return NULL for embedders not implementing
+    // the AccessTokenStore class, so we report an error to avoid JavaScript
+    // requests of location to wait eternally for a reply.

[Wez, 2016/06/10 23:40:34]

nit: Strange wording; I think you mean ".. to avoid JS callers waiting
indefinitely for a reply."?

This seems less to avoid JS waiting indefinitely, and more to be a simple case
of that being the way the API is suppose to work - that it returns an error if
it cannot succeed?

[CJ, 2016/06/13 23:45:20]

I didn't write the comment, just have been trying to keep it with the code it
belongs with, so my insight into why it is written in such a way is limited.
Updating according to your feedback, making it more about the general error
handling. 

+    Geoposition position;
+    position.error_code = Geoposition::ERROR_CODE_PERMISSION_DENIED;
+    arbitrator_update_callback_.Run(position);
+    return;
+  }
   for (const auto& provider : providers_)
     provider->StartProvider(enable_high_accuracy_);
 }
@@ -95,11 +101,6 @@ void LocationArbitratorImpl::StopProviders() {
 void LocationArbitratorImpl::OnAccessTokenStoresLoaded(
     AccessTokenStore::AccessTokenMap access_token_map,
     net::URLRequestContextGetter* context_getter) {
-  if (!is_running_ || !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_map.empty())
     access_token_map[DefaultNetworkProviderURL()];
@@ -107,12 +108,6 @@ void LocationArbitratorImpl::OnAccessTokenStoresLoaded(
     RegisterProvider(NewNetworkLocationProvider(
         GetAccessTokenStore(), context_getter, entry.first, entry.second));
   }
-
-  LocationProvider* provider =
-      GetContentClient()->browser()->OverrideSystemLocationProvider();
-  if (!provider)
-    provider = NewSystemLocationProvider();
-  RegisterProvider(provider);
   DoStartProviders();
 }
 
@@ -126,6 +121,14 @@ void LocationArbitratorImpl::RegisterProvider(
   providers_.push_back(provider);
 }
 
+void LocationArbitratorImpl::RegisterSystemProvider() {
+  LocationProvider* provider =
+      GetContentClient()->browser()->OverrideSystemLocationProvider();
+  if (!provider)
+    provider = NewSystemLocationProvider();
+  RegisterProvider(provider);
+}
+
 void LocationArbitratorImpl::OnLocationUpdate(const LocationProvider* provider,
                                               const Geoposition& new_position) {
   DCHECK(new_position.Validate() ||