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..20639092e42f5cbd5268554f99284a4a9ad7b7a0 100644
--- a/content/browser/geolocation/location_arbitrator_impl.cc
+++ b/content/browser/geolocation/location_arbitrator_impl.cc
@@ -100,14 +100,15 @@ 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()) {
+    // 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 =

[Kevin M, 2016/05/31 23:43:55]

nit: provider_override

[CJ, 2016/05/31 23:51:24]

Done.

       GetContentClient()->browser()->OverrideSystemLocationProvider();
   if (!provider)