diff options
author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-25 18:18:01 +0000 |
---|---|---|
committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-25 18:18:01 +0000 |
commit | ad65a3ee540552ecca50ebbf9382f1a4c718d383 (patch) | |
tree | 68082d6d78331413eba2f799547026940c07e004 /ipc | |
parent | 750f4497a3b87a4a028d4d6ce3ce88e01314139c (diff) | |
download | chromium_src-ad65a3ee540552ecca50ebbf9382f1a4c718d383.zip chromium_src-ad65a3ee540552ecca50ebbf9382f1a4c718d383.tar.gz chromium_src-ad65a3ee540552ecca50ebbf9382f1a4c718d383.tar.bz2 |
Update uses of UTF conversions in courgette/, device/, extensions/, google_apis/, gpu/, ipc/, media/, net/ to use the base:: namespace.
BUG=330556
TEST=no change
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/112963005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242496 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc')
-rw-r--r-- | ipc/ipc_channel_win.cc | 4 | ||||
-rw-r--r-- | ipc/ipc_message_utils.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ipc/ipc_channel_win.cc b/ipc/ipc_channel_win.cc index 802a0a2..418e8cb 100644 --- a/ipc/ipc_channel_win.cc +++ b/ipc/ipc_channel_win.cc @@ -192,13 +192,13 @@ const base::string16 Channel::ChannelImpl::PipeName( if (index != std::string::npos) { if (secret) // Retrieve the secret if asked for. base::StringToInt(channel_id.substr(index + 1), secret); - return ASCIIToWide(name.append(channel_id.substr(0, index - 1))); + return base::ASCIIToWide(name.append(channel_id.substr(0, index - 1))); } // This case is here to support predictable named pipes in tests. if (secret) *secret = 0; - return ASCIIToWide(name.append(channel_id)); + return base::ASCIIToWide(name.append(channel_id)); } bool Channel::ChannelImpl::CreatePipe(const IPC::ChannelHandle &channel_handle, diff --git a/ipc/ipc_message_utils.cc b/ipc/ipc_message_utils.cc index 0390648..b652443 100644 --- a/ipc/ipc_message_utils.cc +++ b/ipc/ipc_message_utils.cc @@ -340,12 +340,12 @@ void ParamTraits<std::string>::Log(const param_type& p, std::string* l) { } void ParamTraits<std::wstring>::Log(const param_type& p, std::string* l) { - l->append(WideToUTF8(p)); + l->append(base::WideToUTF8(p)); } #if !defined(WCHAR_T_IS_UTF16) void ParamTraits<base::string16>::Log(const param_type& p, std::string* l) { - l->append(UTF16ToUTF8(p)); + l->append(base::UTF16ToUTF8(p)); } #endif |