Gets rid of the LocationArbitrator interface, in preference for LocationProvider.

device/geolocation/network_location_provider.h

 // 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.
 
 #ifndef DEVICE_GEOLOCATION_NETWORK_LOCATION_PROVIDER_H_
 #define DEVICE_GEOLOCATION_NETWORK_LOCATION_PROVIDER_H_
 
 #include <stddef.h>
 
 #include <list>
@@ skipping 52 matching lines @@
     CacheAgeList cache_age_list_;  // Oldest first.
   };
 
   NetworkLocationProvider(
       const scoped_refptr<AccessTokenStore>& access_token_store,
       const scoped_refptr<net::URLRequestContextGetter>& context,
       const GURL& url,
       const base::string16& access_token);
   ~NetworkLocationProvider() override;
 
+  // LocationProviderBase implemenation.
+  void RequestRefresh() override;

[Wez, 2016/08/12 00:33:44]

There doesn't seem to be any need for this to be part of LocationProviderBase -
let's make it purely an internal detail of this provider?

[CJ, 2016/08/12 20:22:46]

Done.

+
   // LocationProvider implementation
   bool StartProvider(bool high_accuracy) override;
   void StopProvider() override;
   void GetPosition(Geoposition* position) override;
-  void RequestRefresh() override;
   void OnPermissionGranted() override;
 
  private:
   // Satisfies a position request from cache or network.
   void RequestPosition();
 
   // Gets called when new wifi data is available.
   void OnWifiDataUpdate();
 
   // Internal helper used by OnWifiDataUpdate.
@@ skipping 47 matching lines @@
 // over the platform-dependent implementations.
 DEVICE_GEOLOCATION_EXPORT LocationProviderBase* NewNetworkLocationProvider(
     const scoped_refptr<AccessTokenStore>& access_token_store,
     const scoped_refptr<net::URLRequestContextGetter>& context,
     const GURL& url,
     const base::string16& access_token);
 
 }  // namespace device
 
 #endif  // DEVICE_GEOLOCATION_NETWORK_LOCATION_PROVIDER_H_