summaryrefslogtreecommitdiffstats
path: root/sandbox/win/tests
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-22 03:42:01 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-22 03:42:01 +0000
commit00b8ae882e96f41c41c27d3070897f02dd75d30b (patch)
tree97229d0caa31bb658e45d3bd1fb9bd6771a3c8a5 /sandbox/win/tests
parent4f5f7561b68b66ebd906e862175d44d12eff91b1 (diff)
downloadchromium_src-00b8ae882e96f41c41c27d3070897f02dd75d30b.zip
chromium_src-00b8ae882e96f41c41c27d3070897f02dd75d30b.tar.gz
chromium_src-00b8ae882e96f41c41c27d3070897f02dd75d30b.tar.bz2
Remove GetModuleHandleHelper(), which was only needed for Win2k (which we don't support).
BUG=none TEST=none Review URL: https://codereview.chromium.org/10951038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158165 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox/win/tests')
-rw-r--r--sandbox/win/tests/common/controller.cc8
1 files changed, 3 insertions, 5 deletions
diff --git a/sandbox/win/tests/common/controller.cc b/sandbox/win/tests/common/controller.cc
index 33dd776..921ce12 100644
--- a/sandbox/win/tests/common/controller.cc
+++ b/sandbox/win/tests/common/controller.cc
@@ -11,7 +11,6 @@
#include "base/sys_string_conversions.h"
#include "base/win/windows_version.h"
#include "sandbox/win/src/sandbox_factory.h"
-#include "sandbox/win/src/sandbox_utils.h"
namespace {
@@ -300,10 +299,9 @@ int DispatchCall(int argc, wchar_t **argv) {
return SBOX_TEST_INVALID_PARAMETER;
HMODULE module;
- if (!GetModuleHandleHelper(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS |
- GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
- reinterpret_cast<wchar_t*>(&DispatchCall),
- &module))
+ if (!GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS |
+ GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
+ reinterpret_cast<wchar_t*>(&DispatchCall), &module))
return SBOX_TEST_FAILED_TO_EXECUTE_COMMAND;
std::string command_name = base::SysWideToMultiByte(argv[3], CP_UTF8);