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

sandbox/src/policy_broker.cc

 // Copyright (c) 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.
 
 #include <map>
 
 #include "sandbox/src/policy_broker.h"
 
 #include "base/logging.h"
-#include "base/pe_image.h"
+#include "base/win/pe_image.h"
 #include "base/win/windows_version.h"
 #include "sandbox/src/interception.h"
 #include "sandbox/src/interceptors.h"
 #include "sandbox/src/policy_target.h"
 #include "sandbox/src/process_thread_interception.h"
 #include "sandbox/src/sandbox.h"
 #include "sandbox/src/sandbox_nt_types.h"
 #include "sandbox/src/sandbox_types.h"
 #include "sandbox/src/sandbox_utils.h"
 #include "sandbox/src/target_process.h"
@@ skipping 13 matching lines @@
     return false
 
 #define INIT_GLOBAL_RTL(member) \
   g_nt.##member = reinterpret_cast<##member##Function>( \
                       ntdll_image.GetProcAddress(#member)); \
   if (NULL == g_nt.##member) \
     return false
 
 bool SetupNtdllImports(TargetProcess *child) {
   HMODULE ntdll = ::GetModuleHandle(kNtdllName);
-  PEImage ntdll_image(ntdll);
+  base::win::PEImage ntdll_image(ntdll);
 
   // Bypass purify's interception.
   wchar_t* loader_get = reinterpret_cast<wchar_t*>(
                             ntdll_image.GetProcAddress("LdrGetDllHandle"));
   if (loader_get) {
     GetModuleHandleHelper(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS |
                               GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
                           loader_get, &ntdll);
   }
 
@@ skipping 53 matching lines @@
       return false;
 
     return INTERCEPT_NT(manager, NtOpenThreadTokenEx, OPEN_THREAD_TOKEN_EX_ID,
                         24);
   }
 
   return true;
 }
 
 }  // namespace sandbox