Update uses of UTF conversions in ppapi/, printing/, remoting/, rlz/, sandbox/, skia/, sql/, sync/,…

remoting/host/win/elevated_controller.cc

 // Copyright (c) 2012 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 "remoting/host/win/elevated_controller.h"
 
 #include "base/file_util.h"
 #include "base/file_version_info.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 304 matching lines @@
   HRESULT hr = ReadConfig(config_dir.Append(kUnprivilegedConfigFileName),
                           &config);
   if (FAILED(hr)) {
     return hr;
   }
 
   // Convert the config back to a string and return it to the caller.
   std::string file_content;
   base::JSONWriter::Write(config.get(), &file_content);
 
-  *config_out = ::SysAllocString(UTF8ToUTF16(file_content).c_str());
+  *config_out = ::SysAllocString(base::UTF8ToUTF16(file_content).c_str());
   if (config_out == NULL) {
     return E_OUTOFMEMORY;
   }
 
   return S_OK;
 }
 
 STDMETHODIMP ElevatedController::GetVersion(BSTR* version_out) {
   // Report the product version number of the daemon controller binary as
   // the host version.
@@ skipping 15 matching lines @@
   return S_OK;
 }
 
 STDMETHODIMP ElevatedController::SetConfig(BSTR config) {
   // Determine the config directory path and create it if necessary.
   base::FilePath config_dir = remoting::GetConfigDir();
   if (!base::CreateDirectory(config_dir)) {
     return HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED);
   }
 
-  std::string file_content = UTF16ToUTF8(
+  std::string file_content = base::UTF16ToUTF8(
     base::string16(static_cast<base::char16*>(config), ::SysStringLen(config)));
 
   return WriteConfig(file_content.c_str(), file_content.size(), owner_window_);
 }
 
 STDMETHODIMP ElevatedController::SetOwnerWindow(LONG_PTR window_handle) {
   owner_window_ = reinterpret_cast<HWND>(window_handle);
   return S_OK;
 }
 
@@ skipping 72 matching lines @@
           << "Failed to stop the '" << kWindowsServiceName << "'service";
       return HRESULT_FROM_WIN32(error);
     }
   }
 
   return S_OK;
 }
 
 STDMETHODIMP ElevatedController::UpdateConfig(BSTR config) {
   // Parse the config.
-  std::string config_str = UTF16ToUTF8(
+  std::string config_str = base::UTF16ToUTF8(
     base::string16(static_cast<base::char16*>(config), ::SysStringLen(config)));
   scoped_ptr<base::Value> config_value(base::JSONReader::Read(config_str));
   if (!config_value.get()) {
     return E_FAIL;
   }
   base::DictionaryValue* config_dict = NULL;
   if (!config_value->GetAsDictionary(&config_dict)) {
     return E_FAIL;
   }
   // Check for bad keys.
@@ skipping 63 matching lines @@
         << "Failed to open to the '" << kWindowsServiceName << "' service";
 
     return HRESULT_FROM_WIN32(error);
   }
 
   service_out->Set(service.Take());
   return S_OK;
 }
 
 } // namespace remoting