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 55 matching lines @@
   NetworkLocationProvider(
       const scoped_refptr<AccessTokenStore>& access_token_store,
       const scoped_refptr<net::URLRequestContextGetter>& context,
       const GURL& url,
       const base::string16& access_token);
   ~NetworkLocationProvider() override;
 
   // LocationProvider implementation
   bool StartProvider(bool high_accuracy) override;
   void StopProvider() override;
-  void GetPosition(Geoposition* position) override;
-  void RequestRefresh() override;
+  const Geoposition& GetPosition() override;
   void OnPermissionGranted() override;
 
  private:
+  // Provides a hint to the provider that new location data is needed as soon
+  // as possible.
+  void RequestRefresh();

[Wez, 2016/08/19 01:33:12]

This comment implies that external callers provide that hint, which they can't -
this is now an implementation detail and it's called to ensure we get frash
location data when permission is granted or the wi-fi state changes.

It's also worth considering whether the two tests in RequestRefresh could just
be folded into RequestPosition().

[CJ, 2016/08/22 17:41:31]

Done. Which tests are you talking about? (Not seeing them).

[Wez, 2016/08/24 04:13:17]

All that RequestRefresh() does is:

   if (!weak_factory_.HasWeakPtrs() || is_wifi_data_complete_) {
   RequestPosition()
  }

So can we just move that if() into RequestPosition() and get rid of
RequestRefresh()?  Would that break anything?

[CJ, 2016/08/24 21:32:05]

Doesnt seem to.

+
   // 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.
   void OnWifiDataUpdated();
 
   bool IsStarted() const;
@@ skipping 44 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_