Remove GetModuleHandleHelper(), which was only needed for Win2k (which we don't support).

sandbox/win/tests/common/controller.cc

 // Copyright (c) 2012 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/win/tests/common/controller.h"
 
 #include <string>
 
 #include "base/process.h"
 #include "base/process_util.h"
 #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 {
 
 static const int kDefaultTimeout = 10000;
 
 // Constructs a full path to a file inside the system32 folder.
 std::wstring MakePathToSys32(const wchar_t* name, bool is_obj_man_path) {
   wchar_t windows_path[MAX_PATH] = {0};
   if (0 == ::GetSystemWindowsDirectoryW(windows_path, MAX_PATH))
     return std::wstring();
@@ skipping 268 matching lines @@
   }
 
   if (0 == _wcsicmp(argv[3], L"ping"))
       return SBOX_TEST_PING_OK;
 
   SboxTestsState state = static_cast<SboxTestsState>(_wtoi(argv[2]));
   if ((state <= MIN_STATE) || (state >= MAX_STATE))
     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);
   CommandFunction command = reinterpret_cast<CommandFunction>(
                                 ::GetProcAddress(module, command_name.c_str()));
   if (!command)
     return SBOX_TEST_FAILED_TO_EXECUTE_COMMAND;
 
   if (BEFORE_INIT == state)
     return command(argc - 4, argv + 4);
@@ skipping 12 matching lines @@
 
     target->LowerToken();
   } else if (0 != _wcsicmp(argv[1], L"-child-no-sandbox")) {
     return SBOX_TEST_FAILED_TO_EXECUTE_COMMAND;
   }
 
   return command(argc - 4, argv + 4);
 }
 
 }  // namespace sandbox