summaryrefslogtreecommitdiff
path: root/chromium/sandbox/win/src/sharedmem_ipc_server.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/sandbox/win/src/sharedmem_ipc_server.cc')
-rw-r--r--chromium/sandbox/win/src/sharedmem_ipc_server.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/sandbox/win/src/sharedmem_ipc_server.cc b/chromium/sandbox/win/src/sharedmem_ipc_server.cc
index e2a30c72366..bf8761e8853 100644
--- a/chromium/sandbox/win/src/sharedmem_ipc_server.cc
+++ b/chromium/sandbox/win/src/sharedmem_ipc_server.cc
@@ -131,7 +131,7 @@ void ReleaseArgs(const IPCParams* ipc_params, void* args[kMaxIpcParams]) {
for (size_t i = 0; i < kMaxIpcParams; i++) {
switch (ipc_params->args[i]) {
case WCHAR_TYPE: {
- delete reinterpret_cast<std::wstring*>(args[i]);
+ delete reinterpret_cast<base::string16*>(args[i]);
args[i] = NULL;
break;
}
@@ -159,7 +159,7 @@ bool GetArgs(CrossCallParamsEx* params, IPCParams* ipc_params,
ipc_params->args[i] = type;
switch (type) {
case WCHAR_TYPE: {
- scoped_ptr<std::wstring> data(new std::wstring);
+ scoped_ptr<base::string16> data(new base::string16);
if (!params->GetParameterStr(i, data.get())) {
args[i] = 0;
ReleaseArgs(ipc_params, args);