Revert 255151 "Make chrome_elf use thunks instead of function po..."

trunk/src/chrome_elf/create_file/chrome_create_file_unittest.cc

 // Copyright 2014 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 "chrome_elf/create_file/chrome_create_file.h"
 
 #include <windows.h>
 
 #include <bitset>
 #include <string>
@@ skipping 359 matching lines @@
   EXPECT_FALSE(ShouldBypass(desktop_junk_path.value().c_str()));
   EXPECT_FALSE(ShouldBypass(desktop_prefs_path.value().c_str()));
 
   // Only redirect "Preferences" and "Local State" files.
   EXPECT_TRUE(ShouldBypass(local_prefs_path.value().c_str()));
   EXPECT_TRUE(ShouldBypass(local_state_path.value().c_str()));
   EXPECT_FALSE(ShouldBypass(local_junk_path.value().c_str()));
 }
 
 TEST_F(ChromeCreateFileTest, NtCreateFileAddressCheck) {
-  EXPECT_EQ(&g_nt_thunk_storage, g_ntdll_lookup["NtCreateFile"]);
+  HMODULE ntdll_handle = ::GetModuleHandle(L"ntdll.dll");
+  EXPECT_EQ(::GetProcAddress(ntdll_handle, "NtCreateFile"),
+            g_ntdll_lookup["NtCreateFile"]);
 }
 
 TEST_F(ChromeCreateFileTest, ReadWriteFromNtDll) {
   base::FilePath file_name = temp_dir_.path().Append(L"some_file.txt");
   DoWriteCheck(file_name, FILE_ATTRIBUTE_NORMAL, false);
   DoReadCheck(file_name, FILE_ATTRIBUTE_NORMAL, false);
 }
 
 }  // namespace