diff options
| author | tkent@chromium.org <tkent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-08 05:34:25 +0000 |
|---|---|---|
| committer | tkent@chromium.org <tkent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-08 05:34:25 +0000 |
| commit | 1cda29e91ff949440ee93675241ee8e1e9e8ab10 (patch) | |
| tree | 05fa297fdc8717f746e54c383f47397b12c222d0 /sandbox/src/target_process.cc | |
| parent | 0174b6962c8c75e60218b1e38fd7cedac9f5bebc (diff) | |
| download | chromium_src-1cda29e91ff949440ee93675241ee8e1e9e8ab10.zip chromium_src-1cda29e91ff949440ee93675241ee8e1e9e8ab10.tar.gz chromium_src-1cda29e91ff949440ee93675241ee8e1e9e8ab10.tar.bz2 | |
Fix issue 8348: unfork pe_image.h / pe_image.cc
Moved versions of those files from sandbox/src/ to base/ (overwrite versions in
base/ to avoid 64-bit warning).
Removed 'sandbox' namespace, adapted other files as necessary.
BUG=8348
TEST=none
Original review URL: http://codereview.chromium.org/179039
Patch by rsteiner
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25611 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox/src/target_process.cc')
| -rw-r--r-- | sandbox/src/target_process.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sandbox/src/target_process.cc b/sandbox/src/target_process.cc index 5bd0a8c..d3ae80d 100644 --- a/sandbox/src/target_process.cc +++ b/sandbox/src/target_process.cc @@ -5,10 +5,10 @@ #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" @@ -54,7 +54,7 @@ void* GetBaseAddress(const wchar_t* exe_name, void* entry_point) { if (NULL == exe) return exe; - sandbox::PEImage pe(exe); + PEImage pe(exe); if (!pe.VerifyMagic()) { ::FreeLibrary(exe); return exe; |