Update uses of UTF conversions in content/ to use the base:: namespace.

BUG=330556
TEST=no change
TBR=ben@chromium.org

Review URL: https://codereview.chromium.org/121033002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242483 0039d316-1c4b-4281-b951-d872f2087c98

12 files changed, 34 insertions, 31 deletions

diff --git a/content/browser/geolocation/network_location_provider.cc b/content/browser/geolocation/network_location_provider.cc
index efc68a7..2a9d7c8 100644
--- a/content/browser/geolocation/network_location_provider.cc
+++ b/content/browser/geolocation/network_location_provider.cc
@@ -77,7 +77,7 @@ bool NetworkLocationProvider::PositionCache::MakeKey(
   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 base::string16 separator(ASCIIToUTF16("|"));
+  const base::string16 separator(base::ASCIIToUTF16("|"));
   for (WifiData::AccessPointDataSet::const_iterator iter =
        wifi_data.access_point_data.begin();
        iter != wifi_data.access_point_data.end();
diff --git a/content/browser/geolocation/network_location_provider_unittest.cc b/content/browser/geolocation/network_location_provider_unittest.cc
index f7c7320..4bd9348 100644
--- a/content/browser/geolocation/network_location_provider_unittest.cc
+++ b/content/browser/geolocation/network_location_provider_unittest.cc
@@ -162,11 +162,11 @@ class GeolocationNetworkProviderTest : public testing::Test {
     for (int i = 0; i < ap_count; ++i) {
       AccessPointData ap;
       ap.mac_address =
-          ASCIIToUTF16(base::StringPrintf("%02d-34-56-78-54-32", i));
+          base::ASCIIToUTF16(base::StringPrintf("%02d-34-56-78-54-32", i));
       ap.radio_signal_strength = ap_count - i;
       ap.channel = IndexToChannel(i);
       ap.signal_to_noise = i + 42;
-      ap.ssid = ASCIIToUTF16("Some nice+network|name\\");
+      ap.ssid = base::ASCIIToUTF16("Some nice+network|name\\");
       data.access_point_data.insert(ap);
     }
     return data;
@@ -421,7 +421,7 @@ TEST_F(GeolocationNetworkProviderTest, MultipleWifiScansComplete) {
   EXPECT_TRUE(position.Validate());
 
   // Token should be in the store.
-  EXPECT_EQ(UTF8ToUTF16(REFERENCE_ACCESS_TOKEN),
+  EXPECT_EQ(base::UTF8ToUTF16(REFERENCE_ACCESS_TOKEN),
             access_token_store_->access_token_set_[test_server_url_]);
 
   // Wifi updated again, with one less AP. This is 'close enough' to the
@@ -517,7 +517,7 @@ TEST_F(GeolocationNetworkProviderTest, NetworkRequestDeferredForPermission) {
 TEST_F(GeolocationNetworkProviderTest,
        NetworkRequestWithWifiDataDeferredForPermission) {
   access_token_store_->access_token_set_[test_server_url_] =
-      UTF8ToUTF16(REFERENCE_ACCESS_TOKEN);
+      base::UTF8ToUTF16(REFERENCE_ACCESS_TOKEN);
   scoped_ptr<LocationProvider> provider(CreateProvider(false));
   EXPECT_TRUE(provider->StartProvider(false));
   net::TestURLFetcher* fetcher = get_url_fetcher_and_advance_id();
diff --git a/content/browser/geolocation/network_location_request.cc b/content/browser/geolocation/network_location_request.cc
index 3ed7092..8fb6e6a 100644
--- a/content/browser/geolocation/network_location_request.cc
+++ b/content/browser/geolocation/network_location_request.cc
@@ -262,7 +262,7 @@ void AddWifiData(const WifiData& wifi_data,
       iter != access_points_by_signal_strength.end();
       ++iter) {
     base::DictionaryValue* wifi_dict = new base::DictionaryValue();
-    AddString("macAddress", UTF16ToUTF8((*iter)->mac_address), wifi_dict);
+    AddString("macAddress", base::UTF16ToUTF8((*iter)->mac_address), wifi_dict);
     AddInteger("signalStrength", (*iter)->radio_signal_strength, wifi_dict);
     AddInteger("age", age_milliseconds, wifi_dict);
     AddInteger("channel", (*iter)->channel, wifi_dict);
diff --git a/content/browser/geolocation/wifi_data_provider_chromeos.cc b/content/browser/geolocation/wifi_data_provider_chromeos.cc
index a8b2041..49edb23 100644
--- a/content/browser/geolocation/wifi_data_provider_chromeos.cc
+++ b/content/browser/geolocation/wifi_data_provider_chromeos.cc
@@ -151,11 +151,11 @@ bool WifiDataProviderChromeOs::GetAccessPointData(
            = access_points.begin();
        i != access_points.end(); ++i) {
     AccessPointData ap_data;
-    ap_data.mac_address = ASCIIToUTF16(i->mac_address);
+    ap_data.mac_address = base::ASCIIToUTF16(i->mac_address);
     ap_data.radio_signal_strength = i->signal_strength;
     ap_data.channel = i->channel;
     ap_data.signal_to_noise = i->signal_to_noise;
-    ap_data.ssid = UTF8ToUTF16(i->ssid);
+    ap_data.ssid = base::UTF8ToUTF16(i->ssid);
     result->insert(ap_data);
   }
   // If the age is significantly longer than our long polling time, assume the
diff --git a/content/browser/geolocation/wifi_data_provider_chromeos_unittest.cc b/content/browser/geolocation/wifi_data_provider_chromeos_unittest.cc
index f9deb66..f282f31 100644
--- a/content/browser/geolocation/wifi_data_provider_chromeos_unittest.cc
+++ b/content/browser/geolocation/wifi_data_provider_chromeos_unittest.cc
@@ -84,7 +84,8 @@ TEST_F(GeolocationChromeOsWifiDataProviderTest, GetOneAccessPoint) {
   AddAccessPoints(1, 1);
   EXPECT_TRUE(GetAccessPointData());
   ASSERT_EQ(1u, ap_data_.size());
-  EXPECT_EQ("00:00:03:04:05:06", UTF16ToUTF8(ap_data_.begin()->mac_address));
+  EXPECT_EQ("00:00:03:04:05:06",
+            base::UTF16ToUTF8(ap_data_.begin()->mac_address));
 }
 
 TEST_F(GeolocationChromeOsWifiDataProviderTest, GetManyAccessPoints) {
diff --git a/content/browser/geolocation/wifi_data_provider_common.cc b/content/browser/geolocation/wifi_data_provider_common.cc
index 9c2cbae..388a17e 100644
--- a/content/browser/geolocation/wifi_data_provider_common.cc
+++ b/content/browser/geolocation/wifi_data_provider_common.cc
@@ -15,13 +15,13 @@ base::string16 MacAddressAsString16(const uint8 mac_as_int[6]) {
   // Format is XX-XX-XX-XX-XX-XX.
   static const char* const kMacFormatString =
       "%02x-%02x-%02x-%02x-%02x-%02x";
-  return ASCIIToUTF16(base::StringPrintf(kMacFormatString,
-                                        mac_as_int[0],
-                                        mac_as_int[1],
-                                        mac_as_int[2],
-                                        mac_as_int[3],
-                                        mac_as_int[4],
-                                        mac_as_int[5]));
+  return base::ASCIIToUTF16(base::StringPrintf(kMacFormatString,
+                                               mac_as_int[0],
+                                               mac_as_int[1],
+                                               mac_as_int[2],
+                                               mac_as_int[3],
+                                               mac_as_int[4],
+                                               mac_as_int[5]));
 }
 
 WifiDataProviderCommon::WifiDataProviderCommon()
diff --git a/content/browser/geolocation/wifi_data_provider_common_unittest.cc b/content/browser/geolocation/wifi_data_provider_common_unittest.cc
index 61e236f..9c55dfd 100644
--- a/content/browser/geolocation/wifi_data_provider_common_unittest.cc
+++ b/content/browser/geolocation/wifi_data_provider_common_unittest.cc
@@ -173,7 +173,7 @@ TEST_F(GeolocationWifiDataProviderCommonTest, IntermittentWifi){
   single_access_point.mac_address = 3;
   single_access_point.radio_signal_strength = 4;
   single_access_point.signal_to_noise = 5;
-  single_access_point.ssid = ASCIIToUTF16("foossid");
+  single_access_point.ssid = base::ASCIIToUTF16("foossid");
   wlan_api_->data_out_.insert(single_access_point);
 
   provider_->StartDataProvider();
@@ -204,7 +204,7 @@ TEST_F(GeolocationWifiDataProviderCommonTest, DoScanWithResults) {
   single_access_point.mac_address = 3;
   single_access_point.radio_signal_strength = 4;
   single_access_point.signal_to_noise = 5;
-  single_access_point.ssid = ASCIIToUTF16("foossid");
+  single_access_point.ssid = base::ASCIIToUTF16("foossid");
   wlan_api_->data_out_.insert(single_access_point);
 
   provider_->StartDataProvider();
diff --git a/content/browser/geolocation/wifi_data_provider_common_win.cc b/content/browser/geolocation/wifi_data_provider_common_win.cc
index a0d334f..aac728d 100644
--- a/content/browser/geolocation/wifi_data_provider_common_win.cc
+++ b/content/browser/geolocation/wifi_data_provider_common_win.cc
@@ -19,9 +19,9 @@ bool ConvertToAccessPointData(const NDIS_WLAN_BSSID& data,
   access_point_data->mac_address = MacAddressAsString16(data.MacAddress);
   access_point_data->radio_signal_strength = data.Rssi;
   // Note that _NDIS_802_11_SSID::Ssid::Ssid is not null-terminated.
-  UTF8ToUTF16(reinterpret_cast<const char*>(data.Ssid.Ssid),
-              data.Ssid.SsidLength,
-              &access_point_data->ssid);
+  base::UTF8ToUTF16(reinterpret_cast<const char*>(data.Ssid.Ssid),
+                    data.Ssid.SsidLength,
+                    &access_point_data->ssid);
   return true;
 }
 
diff --git a/content/browser/geolocation/wifi_data_provider_linux.cc b/content/browser/geolocation/wifi_data_provider_linux.cc
index a8d2135..1e43658 100644
--- a/content/browser/geolocation/wifi_data_provider_linux.cc
+++ b/content/browser/geolocation/wifi_data_provider_linux.cc
@@ -254,7 +254,7 @@ bool NetworkManagerWlanApi::GetAccessPointsForAdapter(
         continue;
       }
       std::string ssid(ssid_bytes, ssid_bytes + ssid_length);
-      access_point_data.ssid = UTF8ToUTF16(ssid);
+      access_point_data.ssid = base::UTF8ToUTF16(ssid);
     }
 
     { // Read the mac address
@@ -275,7 +275,7 @@ bool NetworkManagerWlanApi::GetAccessPointsForAdapter(
       if (!base::HexStringToBytes(mac, &mac_bytes) || mac_bytes.size() != 6) {
         LOG(WARNING) << "Can't parse mac address (found " << mac_bytes.size()
                      << " bytes) so using raw string: " << mac;
-        access_point_data.mac_address = UTF8ToUTF16(mac);
+        access_point_data.mac_address = base::UTF8ToUTF16(mac);
       } else {
         access_point_data.mac_address = MacAddressAsString16(&mac_bytes[0]);
       }
diff --git a/content/browser/geolocation/wifi_data_provider_linux_unittest.cc b/content/browser/geolocation/wifi_data_provider_linux_unittest.cc
index 2e72470..498b230 100644
--- a/content/browser/geolocation/wifi_data_provider_linux_unittest.cc
+++ b/content/browser/geolocation/wifi_data_provider_linux_unittest.cc
@@ -222,8 +222,9 @@ TEST_F(GeolocationWifiDataProviderLinuxTest, GetAccessPointData) {
 
   // Check the contents of the access point data.
   // The expected values come from CreateAccessPointProxyResponse() above.
-  EXPECT_EQ("test", UTF16ToUTF8(access_point_data.ssid));
-  EXPECT_EQ("00-11-22-33-44-55", UTF16ToUTF8(access_point_data.mac_address));
+  EXPECT_EQ("test", base::UTF16ToUTF8(access_point_data.ssid));
+  EXPECT_EQ("00-11-22-33-44-55",
+            base::UTF16ToUTF8(access_point_data.mac_address));
   EXPECT_EQ(-50, access_point_data.radio_signal_strength);
   EXPECT_EQ(4, access_point_data.channel);
 }
diff --git a/content/browser/geolocation/wifi_data_provider_mac.cc b/content/browser/geolocation/wifi_data_provider_mac.cc
index e7d8e82..6a87801 100644
--- a/content/browser/geolocation/wifi_data_provider_mac.cc
+++ b/content/browser/geolocation/wifi_data_provider_mac.cc
@@ -140,9 +140,10 @@ bool Apple80211Api::GetAccessPointData(WifiData::AccessPointDataSet* data) {
     // WirelessNetworkInfo::noise appears to be noise floor in dBm.
     access_point_data.signal_to_noise = access_point_info->signal -
                                         access_point_info->noise;
-    if (!UTF8ToUTF16(reinterpret_cast<const char*>(access_point_info->name),
-                     access_point_info->nameLen,
-                     &access_point_data.ssid)) {
+    if (!base::UTF8ToUTF16(reinterpret_cast<const char*>(
+                               access_point_info->name),
+                           access_point_info->nameLen,
+                           &access_point_data.ssid)) {
       access_point_data.ssid.clear();
     }
     data->insert(access_point_data);
diff --git a/content/browser/geolocation/wifi_data_provider_win.cc b/content/browser/geolocation/wifi_data_provider_win.cc
index ed69865..a4e6e74 100644
--- a/content/browser/geolocation/wifi_data_provider_win.cc
+++ b/content/browser/geolocation/wifi_data_provider_win.cc
@@ -520,9 +520,9 @@ bool GetNetworkData(const WLAN_BSS_ENTRY& bss_entry,
   access_point_data->mac_address = MacAddressAsString16(bss_entry.dot11Bssid);
   access_point_data->radio_signal_strength = bss_entry.lRssi;
   // bss_entry.dot11Ssid.ucSSID is not null-terminated.
-  UTF8ToUTF16(reinterpret_cast<const char*>(bss_entry.dot11Ssid.ucSSID),
-              static_cast<ULONG>(bss_entry.dot11Ssid.uSSIDLength),
-              &access_point_data->ssid);
+  base::UTF8ToUTF16(reinterpret_cast<const char*>(bss_entry.dot11Ssid.ucSSID),
+                    static_cast<ULONG>(bss_entry.dot11Ssid.uSSIDLength),
+                    &access_point_data->ssid);
   // TODO(steveblock): Is it possible to get the following?
   // access_point_data->signal_to_noise
   // access_point_data->age