Update uses of UTF conversions in ppapi/, printing/, remoting/, rlz/, sandbox/, skia/, sql/, sync/, tools/, webkit/, win8/ to use the base:: namespace.

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

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

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

5 files changed, 12 insertions, 9 deletions

diff --git a/rlz/ios/lib/machine_id_ios.cc b/rlz/ios/lib/machine_id_ios.cc
index b712dd9..f000ce5 100644
--- a/rlz/ios/lib/machine_id_ios.cc
+++ b/rlz/ios/lib/machine_id_ios.cc
@@ -9,7 +9,7 @@
 namespace rlz_lib {
 
 bool GetRawMachineId(base::string16* data, int* more_data) {
-  *data = ASCIIToUTF16(ios::device_util::GetDeviceIdentifier(NULL));
+  *data = base::ASCIIToUTF16(ios::device_util::GetDeviceIdentifier(NULL));
   *more_data = 1;
   return true;
 }
diff --git a/rlz/lib/machine_id_unittest.cc b/rlz/lib/machine_id_unittest.cc
index bcae511..b3f3c61 100644
--- a/rlz/lib/machine_id_unittest.cc
+++ b/rlz/lib/machine_id_unittest.cc
@@ -11,7 +11,7 @@
 
 // This test will fail if the behavior of GetMachineId changes.
 TEST(MachineDealCodeTestMachineId, MachineId) {
-  base::string16 computer_sid(UTF8ToUTF16(
+  base::string16 computer_sid(base::UTF8ToUTF16(
         "S-1-5-21-2345599882-2448789067-1921365677"));
   std::string id;
   rlz_lib::testing::GetMachineIdImpl(computer_sid, 2651229008, &id);
diff --git a/rlz/mac/lib/machine_id_mac.cc b/rlz/mac/lib/machine_id_mac.cc
index af39bb8..6dbb0d7 100644
--- a/rlz/mac/lib/machine_id_mac.cc
+++ b/rlz/mac/lib/machine_id_mac.cc
@@ -123,9 +123,10 @@ bool GetRawMachineId(base::string16* data, int* more_data) {
 
   data->clear();
   if (GetMacAddress(mac_address, sizeof(mac_address))) {
-    *data += ASCIIToUTF16(base::StringPrintf("mac:%02x%02x%02x%02x%02x%02x",
-        mac_address[0], mac_address[1], mac_address[2],
-        mac_address[3], mac_address[4], mac_address[5]));
+    *data += base::ASCIIToUTF16(
+        base::StringPrintf("mac:%02x%02x%02x%02x%02x%02x",
+                           mac_address[0], mac_address[1], mac_address[2],
+                           mac_address[3], mac_address[4], mac_address[5]));
   }
 
   // A MAC address is enough to uniquely identify a machine, but it's only 6
@@ -134,8 +135,8 @@ bool GetRawMachineId(base::string16* data, int* more_data) {
   CFStringRef serial = CopySerialNumber();
   if (serial) {
     if (!data->empty())
-      *data += UTF8ToUTF16(" ");
-    *data += UTF8ToUTF16("serial:") + base::SysCFStringRefToUTF16(serial);
+      *data += base::UTF8ToUTF16(" ");
+    *data += base::UTF8ToUTF16("serial:") + base::SysCFStringRefToUTF16(serial);
     CFRelease(serial);
   }
 
diff --git a/rlz/win/lib/registry_util.cc b/rlz/win/lib/registry_util.cc
index cb4a686..e5b7298 100644
--- a/rlz/win/lib/registry_util.cc
+++ b/rlz/win/lib/registry_util.cc
@@ -31,14 +31,14 @@ bool RegKeyReadValue(base::win::RegKey& key, const wchar_t* name,
   }
 
   // Note that RLZ string are always ASCII by design.
-  strncpy(value, WideToUTF8(value_string).c_str(), *value_size);
+  strncpy(value, base::WideToUTF8(value_string).c_str(), *value_size);
   value[*value_size - 1] = 0;
   return true;
 }
 
 bool RegKeyWriteValue(base::win::RegKey& key, const wchar_t* name,
                       const char* value) {
-  std::wstring value_string(ASCIIToWide(value));
+  std::wstring value_string(base::ASCIIToWide(value));
   return key.WriteValue(name, value_string.c_str()) == ERROR_SUCCESS;
 }
 
diff --git a/rlz/win/lib/rlz_value_store_registry.cc b/rlz/win/lib/rlz_value_store_registry.cc
index 0aa0023..2b50767 100644
--- a/rlz/win/lib/rlz_value_store_registry.cc
+++ b/rlz/win/lib/rlz_value_store_registry.cc
@@ -13,6 +13,8 @@
 #include "rlz/lib/string_utils.h"
 #include "rlz/win/lib/registry_util.h"
 
+using base::ASCIIToWide;
+
 namespace rlz_lib {
 
 namespace {