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

chrome/browser/win/enumerate_modules_model.cc

Index: chrome/browser/win/enumerate_modules_model.cc
diff --git a/chrome/browser/win/enumerate_modules_model.cc b/chrome/browser/win/enumerate_modules_model.cc
index ded03688a5fbd8d090cd8c439621922d864d1b73..376e6b08bf18de878278b889079182c067c39854 100644
--- a/chrome/browser/win/enumerate_modules_model.cc
+++ b/chrome/browser/win/enumerate_modules_model.cc
@@ -445,7 +445,6 @@ void ModuleEnumerator::ScanImpl() {
                       checkpoint2 - checkpoint);
 
   // TODO(chrisha): Annotate any modules that are suspicious/bad.
-  AnnotateBadModules();
 
   ReportThirdPartyMetrics();
 
@@ -635,19 +634,6 @@ void ModuleEnumerator::CollapsePath(Module* entry) {
   }
 }
 
-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 ";