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..d46cb319c1c3bdae6a5baeff677099d4272ac724 100644
--- a/content/browser/geolocation/location_arbitrator_impl.cc
+++ b/content/browser/geolocation/location_arbitrator_impl.cc
@@ -100,19 +100,20 @@ void LocationArbitratorImpl::OnAccessTokenStoresLoaded(
     // 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()];
-  for (const auto& entry : access_token_map) {
-    RegisterProvider(NewNetworkLocationProvider(
-        GetAccessTokenStore(), context_getter, entry.first, entry.second));
+  if (GetContentClient()->browser()->UseDefaultLocationProviders()) {

[Wez, 2016/06/01 21:45:19]

Do you need access-token-stores to have been loaded if we're not using network
location?  If not then is there somewhere earlier at which we could/should do
this test?

e.g Should we do this in StartProviders(), under the if (providers_.empty())
case, and skip both GetAccessTokenStore() and LoadAccessTokens() in the case in
which we don't need the network providers?

Do any non-network providers use the access tokens?

[CJ, 2016/06/01 22:37:10]

Don't think so.

Done.

+    // If there are no access tokens, boot strap it with the default server URL.
+    if (access_token_map.empty())
+      access_token_map[DefaultNetworkProviderURL()];
+    for (const auto& entry : access_token_map) {
+      RegisterProvider(NewNetworkLocationProvider(
+          GetAccessTokenStore(), context_getter, entry.first, entry.second));
+    }
   }
-
-  LocationProvider* provider =
+  LocationProvider* provider_override =
       GetContentClient()->browser()->OverrideSystemLocationProvider();
-  if (!provider)
-    provider = NewSystemLocationProvider();
-  RegisterProvider(provider);
+  if (!provider_override)
+    provider_override = NewSystemLocationProvider();
+  RegisterProvider(provider_override);
   DoStartProviders();
 }