Move pe_image and registry from base to base/win and use the namespace. It re...

sandbox/src/interception.cc

 // Copyright (c) 2006-2010 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/src/interception.h"
 
 #include "base/logging.h"
-#include "base/pe_image.h"
 #include "base/scoped_ptr.h"
+#include "base/win/pe_image.h"
 #include "sandbox/src/interception_internal.h"
 #include "sandbox/src/interceptors.h"
 #include "sandbox/src/sandbox.h"
 #include "sandbox/src/sandbox_utils.h"
 #include "sandbox/src/service_resolver.h"
 #include "sandbox/src/target_interceptions.h"
 #include "sandbox/src/target_process.h"
 #include "sandbox/src/wow64.h"
 
 namespace {
@@ skipping 379 matching lines @@
 bool InterceptionManager::PatchClientFunctions(DllInterceptionData* thunks,
                                                size_t thunk_bytes,
                                                DllInterceptionData* dll_data) {
   DCHECK(NULL != thunks);
   DCHECK(NULL != dll_data);
 
   HMODULE ntdll_base = ::GetModuleHandle(kNtdllName);
   if (!ntdll_base)
     return false;
 
-  PEImage ntdll_image(ntdll_base);
+  base::win::PEImage ntdll_image(ntdll_base);
 
   // Bypass purify's interception.
   wchar_t* loader_get = reinterpret_cast<wchar_t*>(
                             ntdll_image.GetProcAddress("LdrGetDllHandle"));
   if (loader_get) {
     if (!GetModuleHandleHelper(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS |
                                    GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
                                loader_get, &ntdll_base))
       return false;
   }
@@ skipping 67 matching lines @@
     ::FreeLibrary(local_interceptor);
 #endif
 
   if (it != interceptions_.end())
     return false;
 
   return true;
 }
 
 }  // namespace sandbox