Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(248)

Unified Diff: sandbox/win/src/interception.cc

Issue 109843003: Replace wstring with string16 in sandbox (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sandbox/win/src/interception.h ('k') | sandbox/win/src/ipc_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sandbox/win/src/interception.cc
diff --git a/sandbox/win/src/interception.cc b/sandbox/win/src/interception.cc
index 8c897a1a977c0e4798a850e81efa125405518ebb..dde585735f13b763347ecc53f96bba70145f9ffe 100644
--- a/sandbox/win/src/interception.cc
+++ b/sandbox/win/src/interception.cc
@@ -11,6 +11,7 @@
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
+#include "base/strings/string16.h"
#include "base/win/pe_image.h"
#include "base/win/windows_version.h"
#include "sandbox/win/src/interception_internal.h"
@@ -141,7 +142,7 @@ bool InterceptionManager::InitializeInterceptions() {
}
size_t InterceptionManager::GetBufferSize() const {
- std::set<std::wstring> dlls;
+ std::set<base::string16> dlls;
size_t buffer_bytes = 0;
std::list<InterceptionData>::const_iterator it = interceptions_.begin();
@@ -202,7 +203,7 @@ bool InterceptionManager::SetupConfigBuffer(void* buffer, size_t buffer_bytes) {
continue;
}
- const std::wstring dll = it->dll;
+ const base::string16 dll = it->dll;
if (!SetupDllInfo(*it, &buffer, &buffer_bytes))
return false;
@@ -355,7 +356,7 @@ bool InterceptionManager::IsInterceptionPerformedByChild(
if (data.type >= INTERCEPTION_LAST)
return false;
- std::wstring ntdll(kNtdllName);
+ base::string16 ntdll(kNtdllName);
if (ntdll == data.dll)
return false; // ntdll has to be intercepted from the parent
@@ -493,7 +494,7 @@ bool InterceptionManager::PatchClientFunctions(DllInterceptionData* thunks,
std::list<InterceptionData>::iterator it = interceptions_.begin();
for (; it != interceptions_.end(); ++it) {
- const std::wstring ntdll(kNtdllName);
+ const base::string16 ntdll(kNtdllName);
if (it->dll != ntdll)
break;
« no previous file with comments | « sandbox/win/src/interception.h ('k') | sandbox/win/src/ipc_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698