summaryrefslogtreecommitdiffstats
path: root/ipc
diff options
context:
space:
mode:
Diffstat (limited to 'ipc')
-rw-r--r--ipc/ipc_channel_win.cc4
-rw-r--r--ipc/ipc_message_utils.cc4
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