Replace wstring with string16 in sandbox

sandbox/win/src/interception.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // For information about interceptions as a whole see
 // http://dev.chromium.org/developers/design-documents/sandbox .
 
 #include <set>
 
 #include "sandbox/win/src/interception.h"
 
 #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"
 #include "sandbox/win/src/interceptors.h"
 #include "sandbox/win/src/sandbox.h"
 #include "sandbox/win/src/sandbox_utils.h"
 #include "sandbox/win/src/service_resolver.h"
 #include "sandbox/win/src/target_interceptions.h"
 #include "sandbox/win/src/target_process.h"
 #include "sandbox/win/src/wow64.h"
@@ skipping 110 matching lines @@
     return false;
 
   g_interceptions = reinterpret_cast<SharedMemory*>(remote_buffer);
   ResultCode rc = child_->TransferVariable("g_interceptions",
                                            &g_interceptions,
                                            sizeof(g_interceptions));
   return (SBOX_ALL_OK == rc);
 }
 
 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();
   for (; it != interceptions_.end(); ++it) {
     // skip interceptions that are performed from the parent
     if (!IsInterceptionPerformedByChild(*it))
       continue;
 
     if (!dlls.count(it->dll)) {
       // NULL terminate the dll name on the structure
@@ skipping 40 matching lines @@
   buffer = dll_info;
 
   std::list<InterceptionData>::iterator it = interceptions_.begin();
   for (; it != interceptions_.end();) {
     // skip interceptions that are performed from the parent
     if (!IsInterceptionPerformedByChild(*it)) {
       ++it;
       continue;
     }
 
-    const std::wstring dll = it->dll;
+    const base::string16 dll = it->dll;
     if (!SetupDllInfo(*it, &buffer, &buffer_bytes))
       return false;
 
     // walk the interceptions from this point, saving the ones that are
     // performed on this dll, and removing the entry from the list.
     // advance the iterator before removing the element from the list
     std::list<InterceptionData>::iterator rest = it;
     for (; rest != interceptions_.end();) {
       if (rest->dll == dll) {
         if (!SetupInterceptionInfo(*rest, &buffer, &buffer_bytes, dll_info))
@@ skipping 132 matching lines @@
     const InterceptionData& data) const {
   if (INTERCEPTION_INVALID == data.type)
     return false;
 
   if (INTERCEPTION_SERVICE_CALL == data.type)
     return false;
 
   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
 
   return true;
 }
 
 bool InterceptionManager::PatchNtdll(bool hot_patch_needed) {
   // Maybe there is nothing to do
   if (!hot_patch_needed && interceptions_.empty())
     return true;
@@ skipping 117 matching lines @@
     thunk = new Win2kResolverThunk(child_->Process(), relaxed_);
   } else if (os_info->version() >= base::win::VERSION_WIN8) {
     thunk = new Win8ResolverThunk(child_->Process(), relaxed_);
   } else {
     thunk = new ServiceResolverThunk(child_->Process(), relaxed_);
   }
 #endif
 
   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;
 
     if (INTERCEPTION_SERVICE_CALL != it->type)
       break;
 
 #if SANDBOX_EXPORTS
     // We may be trying to patch by function name.
     if (NULL == it->interceptor_address) {
       const char* address;
@@ skipping 34 matching lines @@
     ::FreeLibrary(local_interceptor);
 #endif
 
   if (it != interceptions_.end())
     return false;
 
   return true;
 }
 
 }  // namespace sandbox