Remove conflicting modules flag.

chrome/browser/enumerate_modules_model_win.cc

Index: chrome/browser/enumerate_modules_model_win.cc
diff --git a/chrome/browser/enumerate_modules_model_win.cc b/chrome/browser/enumerate_modules_model_win.cc
index 78c01a43e9aa6982b46eea9dfa34d92819082c78..dc7fbbff45bb698e419e538b27e2b3f807de127d 100644
--- a/chrome/browser/enumerate_modules_model_win.cc
+++ b/chrome/browser/enumerate_modules_model_win.cc
@@ -987,8 +987,7 @@ void EnumerateModulesModel::MaybePostScanningTask() {
     done = true;
 
     const CommandLine& cmd_line = *CommandLine::ForCurrentProcess();
-    if (cmd_line.HasSwitch(switches::kConflictingModulesCheck) ||
-        base::win::GetVersion() == base::win::VERSION_XP) {
+    if (base::win::GetVersion() == base::win::VERSION_XP) {
       check_modules_timer_.Start(FROM_HERE,
           base::TimeDelta::FromMilliseconds(kModuleCheckDelayMs),
           this, &EnumerateModulesModel::ScanNow);
@@ -1030,18 +1029,6 @@ void EnumerateModulesModel::DoneScanning() {
       chrome::NOTIFICATION_MODULE_LIST_ENUMERATED,
       content::Source<EnumerateModulesModel>(this),
       content::NotificationService::NoDetails());
-
-  // Command line flag must be enabled for the notification to get sent out.
-  // Otherwise we'd get the badge (while the feature is disabled) when we
-  // navigate to about:conflicts and find confirmed matches.
-  const CommandLine& cmd_line = *CommandLine::ForCurrentProcess();
-  if (!cmd_line.HasSwitch(switches::kConflictingModulesCheck))
-    return;
-
-  content::NotificationService::current()->Notify(
-      chrome::NOTIFICATION_MODULE_INCOMPATIBILITY_BADGE_CHANGE,
-      content::Source<EnumerateModulesModel>(this),
-      content::NotificationService::NoDetails());
 }
 
 GURL EnumerateModulesModel::ConstructHelpCenterUrl(