Fixes for the EnumeratesPE base_unittest failures seen on Windows 8 X64. The values

base/win/pe_image_unittest.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.
 
 // This file contains unit tests for PEImage.
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "base/win/pe_image.h"
 #include "base/win/windows_version.h"
 
@@ skipping 103 matching lines @@
   const int win7_delay_dlls = 7;
   const int win7_exports = 806;
   const int win7_imports = 568;
   const int win7_delay_imports = 71;
   const int win7_relocs = 7812;
   const int win8_delay_dlls = 9;
   const int win8_exports = 806;
   const int win8_imports = 568;
   const int win8_delay_imports = 113;
   const int win8_relocs = 9478;
+  int win8_sections = 4;
+  int win8_import_dlls = 17;
+
+  base::win::OSInfo* os_info = base::win::OSInfo::GetInstance();
+  if (os_info->architecture() == base::win::OSInfo::X86_ARCHITECTURE) {
+    win8_sections = 5;
+    win8_import_dlls = 19;
+  }
 
   // Contains the expected value, for each enumerated property (Value), and the
   // OS version: [Value][os_version]
   const int expected[][5] = {
-    {4, 4, 4, 4, 5},
-    {3, 3, 3, 13, 19},
+    {4, 4, 4, 4, win8_sections},
+    {3, 3, 3, 13, win8_import_dlls},
     {w2k_delay_dlls, xp_delay_dlls, vista_delay_dlls, win7_delay_dlls,
      win8_delay_dlls},
     {w2k_exports, xp_exports, vista_exports, win7_exports, win8_exports},
     {w2k_imports, xp_imports, vista_imports, win7_imports, win8_imports},
     {w2k_delay_imports, xp_delay_imports,
      vista_delay_imports, win7_delay_imports, win8_delay_imports},
     {w2k_relocs, xp_relocs, vista_relocs, win7_relocs, win8_relocs}
   };
 
   if (value > relocs)
@@ skipping 78 matching lines @@
   FARPROC address2 = pe.GetProcAddress(reinterpret_cast<char*>(ordinal));
   EXPECT_TRUE(address1 != NULL);
   EXPECT_TRUE(address2 != NULL);
   EXPECT_TRUE(address1 == address2);
 
   FreeLibrary(module);
 }
 
 }  // namespace win
 }  // namespace base