Disable module integrity verifier for 64-bit builds.

BUG=475072 [email protected] Review URL: https://codereview.chromium.org/1066363003 Cr-Commit-Position: refs/heads/master@{#324268} (cherry picked from commit e2f41fa) [email protected] Review URL: https://codereview.chromium.org/1078393002 Cr-Commit-Position: refs/branch-heads/2357@{#48} Cr-Branched-From: 59d4494-refs/heads/master@{#323860}
crosswalk-project · Apr 11, 2015 · cec610f · cec610f
1 parent ee504fa
commit cec610f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/chrome/browser/safe_browsing/incident_reporting/environment_data_collection_win.cc b/chrome/browser/safe_browsing/incident_reporting/environment_data_collection_win.cc
@@ -129,6 +129,7 @@ void CollectModuleVerificationData(
     const wchar_t* const modules_to_verify[],
     size_t num_modules_to_verify,
     ClientIncidentReport_EnvironmentData_Process* process) {
+#if !defined(_WIN64)
   for (size_t i = 0; i < num_modules_to_verify; ++i) {
     scoped_ptr<ClientIncidentReport_EnvironmentData_Process_ModuleState>
         module_state(
@@ -191,6 +192,7 @@ void CollectModuleVerificationData(
     }
     process->mutable_module_state()->AddAllocated(module_state.release());
   }
+#endif  // _WIN64
 }
 
 void CollectPlatformProcessData(

diff --git a/chrome/browser/safe_browsing/incident_reporting/environment_data_collection_win_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/environment_data_collection_win_unittest.cc
@@ -169,6 +169,7 @@ TEST(SafeBrowsingEnvironmentDataCollectionWinTest, CollectDllBlacklistData) {
   EXPECT_EQ(path_expected, process_report_path);
 }
 
+#if !defined(_WIN64)
 TEST(SafeBrowsingEnvironmentDataCollectionWinTest, VerifyLoadedModules) {
   //  Load the test modules.
   std::vector<base::ScopedNativeLibrary> test_dlls(kTestDllNamesCount);
@@ -218,5 +219,6 @@ TEST(SafeBrowsingEnvironmentDataCollectionWinTest, VerifyLoadedModules) {
   EXPECT_EQ(std::string(kTestExportName),
             process_report.module_state(0).modified_export(0));
 }
+#endif  // _WIN64
 
 }  // namespace safe_browsing