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, 25 insertions, 21 deletions

diff --git a/printing/backend/print_backend_win.cc b/printing/backend/print_backend_win.cc
index 0d1958f..abf8404 100644
--- a/printing/backend/print_backend_win.cc
+++ b/printing/backend/print_backend_win.cc
@@ -95,14 +95,14 @@ std::string PrintBackendWin::GetDefaultPrinterName() {
   TCHAR default_printer_name[MAX_PATH];
   if (!::GetDefaultPrinter(default_printer_name, &size))
     return std::string();
-  return WideToUTF8(default_printer_name);
+  return base::WideToUTF8(default_printer_name);
 }
 
 bool PrintBackendWin::GetPrinterSemanticCapsAndDefaults(
     const std::string& printer_name,
     PrinterSemanticCapsAndDefaults* printer_info) {
   ScopedPrinterHandle printer_handle;
-  if (!printer_handle.OpenPrinter(UTF8ToWide(printer_name).c_str())) {
+  if (!printer_handle.OpenPrinter(base::UTF8ToWide(printer_name).c_str())) {
     LOG(WARNING) << "Failed to open printer, error = " << GetLastError();
     return false;
   }
@@ -111,7 +111,7 @@ bool PrintBackendWin::GetPrinterSemanticCapsAndDefaults(
   if (!info_5.Init(printer_handle)) {
     return false;
   }
-  DCHECK_EQ(info_5.get()->pPrinterName, UTF8ToUTF16(printer_name));
+  DCHECK_EQ(info_5.get()->pPrinterName, base::UTF8ToUTF16(printer_name));
 
   PrinterSemanticCapsAndDefaults caps;
 
@@ -173,7 +173,7 @@ bool PrintBackendWin::GetPrinterCapsAndDefaults(
   }
   DCHECK(printer_info);
   HPTPROVIDER provider = NULL;
-  std::wstring printer_name_wide = UTF8ToWide(printer_name);
+  std::wstring printer_name_wide = base::UTF8ToWide(printer_name);
   HRESULT hr = XPSModule::OpenProvider(printer_name_wide, 1, &provider);
   if (provider) {
     base::win::ScopedComPtr<IStream> print_capabilities_stream;
@@ -236,7 +236,7 @@ bool PrintBackendWin::GetPrinterCapsAndDefaults(
 std::string PrintBackendWin::GetPrinterDriverInfo(
     const std::string& printer_name) {
   ScopedPrinterHandle printer;
-  if (!printer.OpenPrinter(UTF8ToWide(printer_name).c_str())) {
+  if (!printer.OpenPrinter(base::UTF8ToWide(printer_name).c_str())) {
     return std::string();
   }
   return GetDriverInfo(printer);
@@ -244,7 +244,7 @@ std::string PrintBackendWin::GetPrinterDriverInfo(
 
 bool PrintBackendWin::IsValidPrinter(const std::string& printer_name) {
   ScopedPrinterHandle printer_handle;
-  return printer_handle.OpenPrinter(UTF8ToWide(printer_name).c_str());
+  return printer_handle.OpenPrinter(base::UTF8ToWide(printer_name).c_str());
 }
 
 scoped_refptr<PrintBackend> PrintBackend::CreateInstance(
diff --git a/printing/backend/win_helper.cc b/printing/backend/win_helper.cc
index 3d114d9..f7b3310 100644
--- a/printing/backend/win_helper.cc
+++ b/printing/backend/win_helper.cc
@@ -289,15 +289,19 @@ bool InitBasicPrinterInfo(HANDLE printer, PrinterBasicInfo* printer_info) {
   if (!info_2.Init(printer))
     return false;
 
-  printer_info->printer_name = WideToUTF8(info_2.get()->pPrinterName);
-  if (info_2.get()->pComment)
-    printer_info->printer_description = WideToUTF8(info_2.get()->pComment);
-  if (info_2.get()->pLocation)
+  printer_info->printer_name = base::WideToUTF8(info_2.get()->pPrinterName);
+  if (info_2.get()->pComment) {
+    printer_info->printer_description =
+        base::WideToUTF8(info_2.get()->pComment);
+  }
+  if (info_2.get()->pLocation) {
     printer_info->options[kLocationTagName] =
-        WideToUTF8(info_2.get()->pLocation);
-  if (info_2.get()->pDriverName)
+        base::WideToUTF8(info_2.get()->pLocation);
+  }
+  if (info_2.get()->pDriverName) {
     printer_info->options[kDriverNameTagName] =
-        WideToUTF8(info_2.get()->pDriverName);
+        base::WideToUTF8(info_2.get()->pDriverName);
+  }
   printer_info->printer_status = info_2.get()->Status;
 
   std::string driver_info = GetDriverInfo(printer);
@@ -319,16 +323,16 @@ std::string GetDriverInfo(HANDLE printer) {
 
   std::string info[4];
   if (info_6.get()->pName)
-    info[0] = WideToUTF8(info_6.get()->pName);
+    info[0] = base::WideToUTF8(info_6.get()->pName);
 
   if (info_6.get()->pDriverPath) {
     scoped_ptr<FileVersionInfo> version_info(
         FileVersionInfo::CreateFileVersionInfo(
             base::FilePath(info_6.get()->pDriverPath)));
     if (version_info.get()) {
-      info[1] = WideToUTF8(version_info->file_version());
-      info[2] = WideToUTF8(version_info->product_name());
-      info[3] = WideToUTF8(version_info->product_version());
+      info[1] = base::WideToUTF8(version_info->file_version());
+      info[2] = base::WideToUTF8(version_info->product_name());
+      info[3] = base::WideToUTF8(version_info->product_version());
     }
   }
 
diff --git a/printing/printing_context_mac.mm b/printing/printing_context_mac.mm
index 088d3ea..8b40da3 100644
--- a/printing/printing_context_mac.mm
+++ b/printing/printing_context_mac.mm
@@ -149,7 +149,7 @@ PrintingContext::Result PrintingContextMac::UpdatePrinterSettings(
       return OnError();
   } else {
     // Don't need this for preview.
-    if (!SetPrinter(UTF16ToUTF8(settings_.device_name())) ||
+    if (!SetPrinter(base::UTF16ToUTF8(settings_.device_name())) ||
         !SetCopiesInPrintSettings(settings_.copies()) ||
         !SetCollateInPrintSettings(settings_.collate()) ||
         !SetDuplexModeInPrintSettings(settings_.duplex_mode()) ||
diff --git a/printing/printing_context_win.cc b/printing/printing_context_win.cc
index 9e97dd2..1c1e3af 100644
--- a/printing/printing_context_win.cc
+++ b/printing/printing_context_win.cc
@@ -434,7 +434,7 @@ PrintingContext::Result PrintingContextWin::NewDocument(
 
   DCHECK(SimplifyDocumentTitle(document_name) == document_name);
   DOCINFO di = { sizeof(DOCINFO) };
-  const std::wstring& document_name_wide = UTF16ToWide(document_name);
+  const std::wstring& document_name_wide = base::UTF16ToWide(document_name);
   di.lpszDocName = document_name_wide.c_str();
 
   // Is there a debug dump directory specified? If so, force to print to a file.
@@ -447,7 +447,7 @@ PrintingContext::Result PrintingContextWin::NewDocument(
     filename += L"_";
     filename += base::TimeFormatTimeOfDay(now);
     filename += L"_";
-    filename += UTF16ToWide(document_name);
+    filename += base::UTF16ToWide(document_name);
     filename += L"_";
     filename += L"buffer.prn";
     file_util::ReplaceIllegalCharactersInPath(&filename, '_');
diff --git a/printing/printing_utils_unittest.cc b/printing/printing_utils_unittest.cc
index 24a380d..be66fab 100644
--- a/printing/printing_utils_unittest.cc
+++ b/printing/printing_utils_unittest.cc
@@ -9,7 +9,7 @@
 namespace printing {
 
 std::string Simplify(const char* title) {
-  return UTF16ToUTF8(SimplifyDocumentTitle(ASCIIToUTF16(title)));
+  return base::UTF16ToUTF8(SimplifyDocumentTitle(base::ASCIIToUTF16(title)));
 }
 
 TEST(PrintingUtilsTest, SimplifyDocumentTitle) {