Fix issue 8348: unfork pe_image.h / pe_image.cc

sandbox/src/target_process.cc

 // Copyright (c) 2006-2009 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 "sandbox/src/target_process.h"
 
 #include "base/basictypes.h"
+#include "base/pe_image.h"
 #include "base/scoped_ptr.h"
 #include "sandbox/src/crosscall_server.h"
 #include "sandbox/src/crosscall_client.h"
-#include "sandbox/src/pe_image.h"
 #include "sandbox/src/policy_low_level.h"
 #include "sandbox/src/sandbox_types.h"
 #include "sandbox/src/sharedmem_ipc_server.h"
 
 namespace {
 
 void TerminateTarget(PROCESS_INFORMATION* pi) {
   ::CloseHandle(pi->hThread);
   ::TerminateProcess(pi->hProcess, 0);
   ::CloseHandle(pi->hProcess);
@@ skipping 25 matching lines @@
 SANDBOX_INTERCEPT size_t g_shared_IPC_size;
 SANDBOX_INTERCEPT size_t g_shared_policy_size;
 
 // Returns the address of the main exe module in memory taking in account
 // address space layout randomization.
 void* GetBaseAddress(const wchar_t* exe_name, void* entry_point) {
   HMODULE exe = ::LoadLibrary(exe_name);
   if (NULL == exe)
     return exe;
 
-  sandbox::PEImage pe(exe);
+  PEImage pe(exe);
   if (!pe.VerifyMagic()) {
     ::FreeLibrary(exe);
     return exe;
   }
   PIMAGE_NT_HEADERS nt_header = pe.GetNTHeaders();
   char* base = reinterpret_cast<char*>(entry_point) -
     nt_header->OptionalHeader.AddressOfEntryPoint;
 
   ::FreeLibrary(exe);
   return base;
@@ skipping 249 matching lines @@
 
 
 TargetProcess* MakeTestTargetProcess(HANDLE process, HMODULE base_address) {
   TargetProcess* target = new TargetProcess(NULL, NULL, NULL, NULL);
   target->sandbox_process_ = process;
   target->base_address_ = base_address;
   return target;
 }
 
 }  // namespace sandbox