Convert string16 to base::string16 in content.

content/browser/geolocation/network_location_provider.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/network_location_provider.h"
 
 #include "base/bind.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "content/public/browser/access_token_store.h"
 
 namespace content {
 namespace {
 // The maximum period of time we'll wait for a complete set of wifi data
 // before sending the request.
 const int kDataCompleteWaitSeconds = 2;
 }  // namespace
 
 // static
 const size_t NetworkLocationProvider::PositionCache::kMaximumSize = 10;
 
 NetworkLocationProvider::PositionCache::PositionCache() {}
 
 NetworkLocationProvider::PositionCache::~PositionCache() {}
 
 bool NetworkLocationProvider::PositionCache::CachePosition(
     const WifiData& wifi_data,
     const Geoposition& position) {
   // Check that we can generate a valid key for the wifi data.
-  string16 key;
+  base::string16 key;
   if (!MakeKey(wifi_data, &key)) {
     return false;
   }
   // If the cache is full, remove the oldest entry.
   if (cache_.size() == kMaximumSize) {
     DCHECK(cache_age_list_.size() == kMaximumSize);
     CacheAgeList::iterator oldest_entry = cache_age_list_.begin();
     DCHECK(oldest_entry != cache_age_list_.end());
     cache_.erase(*oldest_entry);
     cache_age_list_.erase(oldest_entry);
   }
   DCHECK_LT(cache_.size(), kMaximumSize);
   // Insert the position into the cache.
   std::pair<CacheMap::iterator, bool> result =
       cache_.insert(std::make_pair(key, position));
   if (!result.second) {
     NOTREACHED();  // We never try to add the same key twice.
     CHECK_EQ(cache_.size(), cache_age_list_.size());
     return false;
   }
   cache_age_list_.push_back(result.first);
   DCHECK_EQ(cache_.size(), cache_age_list_.size());
   return true;
 }
 
 // Searches for a cached position response for the current WiFi data. Returns
 // the cached position if available, NULL otherwise.
 const Geoposition* NetworkLocationProvider::PositionCache::FindPosition(
     const WifiData& wifi_data) {
-  string16 key;
+  base::string16 key;
   if (!MakeKey(wifi_data, &key)) {
     return NULL;
   }
   CacheMap::const_iterator iter = cache_.find(key);
   return iter == cache_.end() ? NULL : &iter->second;
 }
 
 // Makes the key for the map of cached positions, using the available data.
 // Returns true if a good key was generated, false otherwise.
 //
 // static
 bool NetworkLocationProvider::PositionCache::MakeKey(
     const WifiData& wifi_data,
-    string16* key) {
+    base::string16* key) {
   // Currently we use only WiFi data and base the key only on the MAC addresses.
   DCHECK(key);
   key->clear();
   const size_t kCharsPerMacAddress = 6 * 3 + 1;  // e.g. "11:22:33:44:55:66|"
   key->reserve(wifi_data.access_point_data.size() * kCharsPerMacAddress);
-  const string16 separator(ASCIIToUTF16("|"));
+  const base::string16 separator(ASCIIToUTF16("|"));
   for (WifiData::AccessPointDataSet::const_iterator iter =
        wifi_data.access_point_data.begin();
        iter != wifi_data.access_point_data.end();
        iter++) {
     *key += separator;
     *key += iter->mac_address;
     *key += separator;
   }
   // If the key is the empty string, return false, as we don't want to cache a
   // position for such data.
   return !key->empty();
 }
 
 // NetworkLocationProvider factory function
 LocationProviderBase* NewNetworkLocationProvider(
     AccessTokenStore* access_token_store,
     net::URLRequestContextGetter* context,
     const GURL& url,
-    const string16& access_token) {
+    const base::string16& access_token) {
   return new NetworkLocationProvider(
       access_token_store, context, url, access_token);
 }
 
 // NetworkLocationProvider
 NetworkLocationProvider::NetworkLocationProvider(
     AccessTokenStore* access_token_store,
     net::URLRequestContextGetter* url_context_getter,
     const GURL& url,
-    const string16& access_token)
+    const base::string16& access_token)
     : access_token_store_(access_token_store),
       wifi_data_provider_(NULL),
       wifi_data_update_callback_(
           base::Bind(&NetworkLocationProvider::WifiDataUpdateAvailable,
                      base::Unretained(this))),
       is_wifi_data_complete_(false),
       access_token_(access_token),
       is_permission_granted_(false),
       is_new_data_available_(false),
       weak_factory_(this) {
@@ skipping 36 matching lines @@
 void NetworkLocationProvider::WifiDataUpdateAvailable(
     WifiDataProvider* provider) {
   DCHECK(provider == wifi_data_provider_);
   is_wifi_data_complete_ = wifi_data_provider_->GetData(&wifi_data_);
   OnWifiDataUpdated();
 }
 
 void NetworkLocationProvider::LocationResponseAvailable(
     const Geoposition& position,
     bool server_error,
-    const string16& access_token,
+    const base::string16& access_token,
     const WifiData& wifi_data) {
   DCHECK(CalledOnValidThread());
   // Record the position and update our cache.
   position_ = position;
   if (position.Validate()) {
     position_cache_->CachePosition(wifi_data, position);
   }
 
   // Record access_token if it's set.
   if (!access_token.empty() && access_token_ != access_token) {
@@ skipping 89 matching lines @@
   }
   request_->MakeRequest(access_token_, wifi_data_,
                         wifi_data_updated_timestamp_);
 }
 
 bool NetworkLocationProvider::IsStarted() const {
   return wifi_data_provider_ != NULL;
 }
 
 }  // namespace content