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

sandbox/win/src/service_resolver_32.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/src/service_resolver.h"
 
 #include "base/memory/scoped_ptr.h"
-#include "sandbox/win/src/sandbox_utils.h"
 #include "sandbox/win/src/win_utils.h"
 
 namespace {
 #pragma pack(push, 1)
 
 const BYTE kMovEax = 0xB8;
 const BYTE kMovEdx = 0xBA;
 const USHORT kMovEdxEsp = 0xD48B;
 const USHORT kCallPtrEdx = 0x12FF;
 const USHORT kCallEdx = 0xD2FF;
@@ skipping 184 matching lines @@
     if (!::ReadProcessMemory(process_,
                              bit_cast<const void*>(function_code.stub),
                              &ki_system_call, sizeof(ki_system_call), &read))
       return false;
 
     if (sizeof(ki_system_call) != read)
       return false;
 
     HMODULE module_1, module_2;
     // last check, call_stub should point to a KiXXSystemCall function on ntdll
-    if (!GetModuleHandleHelper(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS |
-                                  GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
-                               bit_cast<const wchar_t*>(ki_system_call),
-                               &module_1))
+    if (!GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS |
+                               GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
+                           bit_cast<const wchar_t*>(ki_system_call), &module_1))
       return false;
 
     if (NULL != ntdll_base_) {
       // This path is only taken when running the unit tests. We want to be
       // able to patch a buffer in memory, so target_ is not inside ntdll.
       module_2 = ntdll_base_;
     } else {
-      if (!GetModuleHandleHelper(
-              GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS |
-                  GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
-              reinterpret_cast<const wchar_t*>(target_),
-              &module_2)) {
+      if (!GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS |
+                                 GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
+                             reinterpret_cast<const wchar_t*>(target_),
+                             &module_2))
         return false;
-      }
     }
 
     if (module_1 != module_2)
       return false;
   }
 
   // Save the verified code
   memcpy(local_thunk, &function_code, sizeof(function_code));
 
   return true;
@@ skipping 174 matching lines @@
     return false;
   }
 
   // Save the verified code
   memcpy(local_thunk, &function_code, sizeof(function_code));
 
   return true;
 }
 
 }  // namespace sandbox