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()) {

[Michael van Ouwerkerk, 2016/06/01 15:57:35]

This adds one more layer of indirection, as NewNetworkLocationProvider already
has an ifdef to return null on Android. You would want the same for Blimp, but
my understanding is that Blimp doesn't have code in the content layer. Still,
maybe you could reverse the ifdef in NewNetworkLocationProvider to only provide
an instance for the specific configurations of which we know we want one, like
in NewSystemLocationProvider:

#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)

That way, you won't need UseDefaultLocationProviders().

[CJ, 2016/06/01 21:37:06]

Blimp is built with OS_LINUX, so it wouldn't quite work that way. We are also
trying to stay away from introducing any new OS_ build flags to keep Blimp
complexity separated from the rest of chrome. 

+    // 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();
 }
 
 void LocationArbitratorImpl::RegisterProvider(
     LocationProvider* provider) {
   if (!provider)
     return;
   provider->SetUpdateCallback(provider_update_callback_);
   if (is_permission_granted_)
     provider->OnPermissionGranted();
@@ skipping 72 matching lines @@
     }
   }
   return false;
 }
 
 bool LocationArbitratorImpl::HasPermissionBeenGranted() const {
   return is_permission_granted_;
 }
 
 }  // namespace content