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

chrome/common/service_process_util_win.cc

 // Copyright (c) 2011 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 "chrome/common/service_process_util.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/object_watcher.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/win_util.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 
 namespace {
 
 const char* kTerminateEventSuffix = "_service_terminate_evt";
 
 base::string16 GetServiceProcessReadyEventName() {
-  return UTF8ToWide(
+  return base::UTF8ToWide(
       GetServiceProcessScopedVersionedName("_service_ready"));
 }
 
 base::string16 GetServiceProcessTerminateEventName() {
-  return UTF8ToWide(
+  return base::UTF8ToWide(
       GetServiceProcessScopedVersionedName(kTerminateEventSuffix));
 }
 
 std::string GetServiceProcessAutoRunKey() {
   return GetServiceProcessScopedName("_service_run");
 }
 
 // Returns the name of the autotun reg value that we used to use for older
 // versions of Chrome.
 std::string GetObsoleteServiceProcessAutoRunKey() {
   base::FilePath user_data_dir;
   PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
-  std::string scoped_name = WideToUTF8(user_data_dir.value());
+  std::string scoped_name = base::WideToUTF8(user_data_dir.value());
   std::replace(scoped_name.begin(), scoped_name.end(), '\\', '!');
   std::replace(scoped_name.begin(), scoped_name.end(), '/', '!');
   scoped_name.append("_service_run");
   return scoped_name;
 }
 
 class ServiceProcessTerminateMonitor
     : public base::win::ObjectWatcher::Delegate {
  public:
   explicit ServiceProcessTerminateMonitor(const base::Closure& terminate_task)
@@ skipping 26 matching lines @@
 IPC::ChannelHandle GetServiceProcessChannel() {
   return GetServiceProcessScopedVersionedName("_service_ipc");
 }
 
 bool ForceServiceProcessShutdown(const std::string& version,
                                  base::ProcessId process_id) {
   base::win::ScopedHandle terminate_event;
   std::string versioned_name = version;
   versioned_name.append(kTerminateEventSuffix);
   base::string16 event_name =
-      UTF8ToWide(GetServiceProcessScopedName(versioned_name));
+      base::UTF8ToWide(GetServiceProcessScopedName(versioned_name));
   terminate_event.Set(OpenEvent(EVENT_MODIFY_STATE, FALSE, event_name.c_str()));
   if (!terminate_event.IsValid())
     return false;
   SetEvent(terminate_event.Get());
   return true;
 }
 
 bool CheckServiceProcessReady() {
   base::string16 event_name = GetServiceProcessReadyEventName();
   base::win::ScopedHandle event(
@@ skipping 44 matching lines @@
     state_->terminate_monitor->Start();
   }
   return true;
 }
 
 bool ServiceProcessState::AddToAutoRun() {
   DCHECK(autorun_command_line_.get());
   // Remove the old autorun value first because we changed the naming scheme
   // for the autorun value name.
   base::win::RemoveCommandFromAutoRun(
-      HKEY_CURRENT_USER, UTF8ToWide(GetObsoleteServiceProcessAutoRunKey()));
+      HKEY_CURRENT_USER,
+      base::UTF8ToWide(GetObsoleteServiceProcessAutoRunKey()));
   return base::win::AddCommandToAutoRun(
       HKEY_CURRENT_USER,
-      UTF8ToWide(GetServiceProcessAutoRunKey()),
+      base::UTF8ToWide(GetServiceProcessAutoRunKey()),
       autorun_command_line_->GetCommandLineString());
 }
 
 bool ServiceProcessState::RemoveFromAutoRun() {
   // Remove the old autorun value first because we changed the naming scheme
   // for the autorun value name.
   base::win::RemoveCommandFromAutoRun(
-      HKEY_CURRENT_USER, UTF8ToWide(GetObsoleteServiceProcessAutoRunKey()));
+      HKEY_CURRENT_USER,
+      base::UTF8ToWide(GetObsoleteServiceProcessAutoRunKey()));
   return base::win::RemoveCommandFromAutoRun(
-      HKEY_CURRENT_USER, UTF8ToWide(GetServiceProcessAutoRunKey()));
+      HKEY_CURRENT_USER, base::UTF8ToWide(GetServiceProcessAutoRunKey()));
 }
 
 void ServiceProcessState::TearDownState() {
   delete state_;
   state_ = NULL;
 }