Convert base dependencies to use sys_string_conversions instead of the ICU...

base/logging.cc

 // Copyright (c) 2006-2009 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 "base/logging.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 typedef HANDLE FileHandle;
 typedef HANDLE MutexHandle;
@@ skipping 22 matching lines @@
 #include <iomanip>
 #include <cstring>
 #include <algorithm>
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/debug_util.h"
 #include "base/lock_impl.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
-#include "base/sys_string_conversions.h"
+#include "base/utf_string_conversions.h"
 
 namespace logging {
 
 static const int kErrorMessageBufferSize = 256;
 
 #ifdef OS_POSIX
 // Wrapper for strerror_r functions that implement the POSIX interface. POSIX
 // does not define the behaviour for some of the edge cases, so we wrap it to
 // guarantee that they are handled. This is used on all POSIX platforms, but
 // on Linux there are some more cases (see below).
@@ skipping 373 matching lines @@
 
 #if defined(OS_WIN)
   // look for the debug dialog program next to our application
   wchar_t prog_name[MAX_PATH];
   GetModuleFileNameW(NULL, prog_name, MAX_PATH);
   wchar_t* backslash = wcsrchr(prog_name, '\\');
   if (backslash)
     backslash[1] = 0;
   wcscat_s(prog_name, MAX_PATH, L"debug_message.exe");
 
-  std::wstring cmdline = base::SysUTF8ToWide(str);
+  std::wstring cmdline = UTF8ToWide(str);
   if (cmdline.empty())
     return;
 
   STARTUPINFO startup_info;
   memset(&startup_info, 0, sizeof(startup_info));
   startup_info.cb = sizeof(startup_info);
 
   PROCESS_INFORMATION process_info;
   if (CreateProcessW(prog_name, &cmdline[0], NULL, NULL, false, 0, NULL,
                      NULL, &startup_info, &process_info)) {
@@ skipping 318 matching lines @@
   if (!log_file)
     return;
 
   CloseFile(log_file);
   log_file = NULL;
 }
 
 }  // namespace logging
 
 std::ostream& operator<<(std::ostream& out, const wchar_t* wstr) {
-  return out << base::SysWideToUTF8(std::wstring(wstr));
+  return out << WideToUTF8(std::wstring(wstr));
 }