Add support for top level geolocation arbitrator, and access token persistenc...

chrome/browser/geolocation/network_location_provider.cc

 // Copyright (c) 2010 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 "chrome/browser/geolocation/network_location_provider.h"
 
 #include "base/time.h"
+#include "chrome/browser/geolocation/access_token_store.h"
 
 namespace {
 // The maximum period of time we'll wait for a complete set of device data
 // before sending the request.
 const int kDataCompleteWaitPeriod = 1000 * 2;  // 2 seconds
 
 // The maximum size of the cache of positions for previously requested device
 // data.
 const size_t kMaximumCacheSize = 10;
 
@@ skipping 78 matching lines @@
   // a string that represents a set of device data, the other is keyed on the
   // timestamp of the position.
   typedef std::map<string16, Position> CacheMap;
   CacheMap cache_;
   typedef std::map<int64, CacheMap::iterator> CacheTimesMap;
   CacheTimesMap cache_times_;
 };
 
 // NetworkLocationProvider factory function
 LocationProviderBase* NewNetworkLocationProvider(
-    LocationProviderBase::AccessTokenStore* access_token_store,
+    AccessTokenStore* access_token_store,
     URLRequestContextGetter* context,
     const GURL& url,
     const string16& host_name) {
   return new NetworkLocationProvider(access_token_store, context,
                                      url, host_name);
 }
 
 // NetworkLocationProvider
 NetworkLocationProvider::NetworkLocationProvider(
     AccessTokenStore* access_token_store,
@@ skipping 163 matching lines @@
 void NetworkLocationProvider::OnDeviceDataUpdated() {
   DCHECK(CalledOnValidThread());
   device_data_updated_timestamp_ = GetCurrentTimeMillis();
 
   is_new_data_available_ = is_radio_data_complete_ || is_radio_data_complete_;
   if (delayed_start_task_.empty() ||
       (is_radio_data_complete_ && is_radio_data_complete_)) {
     UpdatePosition();
   }
 }