summaryrefslogtreecommitdiffstats
path: root/remoting/host/setup/daemon_controller_delegate_win.cc
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-25 19:37:03 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-25 19:37:03 +0000
commit6c3bf032651d5f912775e0c8cd7e962454145ced (patch)
tree88cf8b652147b9acf47aa81999f8652609890dde /remoting/host/setup/daemon_controller_delegate_win.cc
parentce51317df2e23a717f95e56e1a9db1a7fb330a16 (diff)
downloadchromium_src-6c3bf032651d5f912775e0c8cd7e962454145ced.zip
chromium_src-6c3bf032651d5f912775e0c8cd7e962454145ced.tar.gz
chromium_src-6c3bf032651d5f912775e0c8cd7e962454145ced.tar.bz2
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
Diffstat (limited to 'remoting/host/setup/daemon_controller_delegate_win.cc')
-rw-r--r--remoting/host/setup/daemon_controller_delegate_win.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/remoting/host/setup/daemon_controller_delegate_win.cc b/remoting/host/setup/daemon_controller_delegate_win.cc
index 74f5846..2070c49 100644
--- a/remoting/host/setup/daemon_controller_delegate_win.cc
+++ b/remoting/host/setup/daemon_controller_delegate_win.cc
@@ -58,7 +58,7 @@ const int kUnprivilegedTimeoutSec = 60;
void ConfigToString(const base::DictionaryValue& config, ScopedBstr* out) {
std::string config_str;
base::JSONWriter::Write(&config, &config_str);
- ScopedBstr config_scoped_bstr(UTF8ToUTF16(config_str).c_str());
+ ScopedBstr config_scoped_bstr(base::UTF8ToUTF16(config_str).c_str());
out->Swap(config_scoped_bstr);
}
@@ -183,7 +183,7 @@ scoped_ptr<base::DictionaryValue> DaemonControllerDelegateWin::GetConfig() {
base::string16 file_content(
static_cast<BSTR>(host_config), host_config.Length());
scoped_ptr<base::Value> config(
- base::JSONReader::Read(UTF16ToUTF8(file_content),
+ base::JSONReader::Read(base::UTF16ToUTF8(file_content),
base::JSON_ALLOW_TRAILING_COMMAS));
if (!config || config->GetType() != base::Value::TYPE_DICTIONARY)
@@ -278,7 +278,7 @@ std::string DaemonControllerDelegateWin::GetVersion() {
if (FAILED(hr))
return std::string();
- return UTF16ToUTF8(
+ return base::UTF16ToUTF8(
base::string16(static_cast<BSTR>(version), version.Length()));
}