Index: remoting/host/win/elevated_controller.cc |
diff --git a/remoting/host/win/elevated_controller.cc b/remoting/host/win/elevated_controller.cc |
index d2eea5e0c84478ce40f6672f2b76e82d2504d010..d826dc9e84a6bc8db91c481dbdcb95f0abc1327f 100644 |
--- a/remoting/host/win/elevated_controller.cc |
+++ b/remoting/host/win/elevated_controller.cc |
@@ -322,7 +322,7 @@ STDMETHODIMP ElevatedController::GetConfig(BSTR* config_out) { |
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; |
} |
@@ -358,7 +358,7 @@ STDMETHODIMP ElevatedController::SetConfig(BSTR config) { |
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_); |
@@ -451,7 +451,7 @@ STDMETHODIMP ElevatedController::StopDaemon() { |
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()) { |