Refactor to make BlimpLocationProvider accessible to content layer.

content/browser/geolocation/location_arbitrator_impl.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_impl.h"
 
 #include <map>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 82 matching lines @@
 }
 
 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()];
-  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)
     provider = NewSystemLocationProvider();
   RegisterProvider(provider);
   DoStartProviders();
 }
 
 void LocationArbitratorImpl::RegisterProvider(
     LocationProvider* provider) {
   if (!provider)
@@ skipping 76 matching lines @@
     }
   }
   return false;
 }
 
 bool LocationArbitratorImpl::HasPermissionBeenGranted() const {
   return is_permission_granted_;
 }
 
 }  // namespace content