Merge M55: Revert of Annotate Trusteer Rapport < 3.6 as incompatible with Chrome. (patchset #1 id:1…

chrome/browser/win/enumerate_modules_model.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 "chrome/browser/win/enumerate_modules_model.h"
 
 #include <softpub.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <tlhelp32.h>
@@ skipping 427 matching lines @@
   UMA_HISTOGRAM_TIMES("Conflicts.EnumerateShellExtensions",
                       checkpoint2 - checkpoint);
 
   checkpoint = checkpoint2;
   EnumerateWinsockModules();
   checkpoint2 = base::TimeTicks::Now();
   UMA_HISTOGRAM_TIMES("Conflicts.EnumerateWinsockModules",
                       checkpoint2 - checkpoint);
 
   // TODO(chrisha): Annotate any modules that are suspicious/bad.
-  AnnotateBadModules();
 
   ReportThirdPartyMetrics();
 
   std::sort(enumerated_modules_->begin(),
             enumerated_modules_->end(), ModuleSort);
 
   UMA_HISTOGRAM_TIMES("Conflicts.EnumerationTotalTime",
                       base::TimeTicks::Now() - start_time);
 
   // Send a reply back on the UI thread. The |observer_| outlives this
@@ skipping 169 matching lines @@
                               location.substr(prefix.length() - 1);
       size_t length = new_location.length() - mapping->second.length();
       if (length < min_length) {
         entry->location = new_location;
         min_length = length;
       }
     }
   }
 }
 
-void ModuleEnumerator::AnnotateBadModules() {
-  for (auto& module : *enumerated_modules_) {
-    if (module.name == L"rapportnikko.dll") {
-      base::Version version(base::UTF16ToASCII(module.version));
-      base::Version good("3.6");
-      if (version.CompareTo(good) < 0) {
-        module.status = ModuleStatus::CONFIRMED_BAD;
-        module.recommended_action = RecommendedAction::UNINSTALL;
-      }
-    }
-  }
-}
-
 void ModuleEnumerator::ReportThirdPartyMetrics() {
   static const wchar_t kMicrosoft[] = L"Microsoft ";
 
   // Used for counting unique certificates that need to be validated. A
   // catalog counts as a single certificate, as does a file with a baked in
   // certificate.
   std::set<base::FilePath> unique_certificates;
   size_t microsoft_certificates = 0;
   size_t signed_modules = 0;
   size_t microsoft_modules = 0;
@@ skipping 265 matching lines @@
   module_enumerator_.reset();
 
   UMA_HISTOGRAM_COUNTS_100("Conflicts.SuspectedBadModules",
                            suspected_bad_modules_detected_);
   UMA_HISTOGRAM_COUNTS_100("Conflicts.ConfirmedBadModules",
                            confirmed_bad_modules_detected_);
 
   // Forward the callback to any registered observers.
   FOR_EACH_OBSERVER(Observer, observers_, OnScanCompleted());
 }