Remove conflicting modules flag.

chrome/browser/enumerate_modules_model_win.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/enumerate_modules_model_win.h"
 
 #include <Tlhelp32.h>
 #include <wintrust.h>
 #include <algorithm>
 
@@ skipping 969 matching lines @@
 EnumerateModulesModel::~EnumerateModulesModel() {
   delete lock;
 }
 
 void EnumerateModulesModel::MaybePostScanningTask() {
   static bool done = false;
   if (!done) {
     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);
     }
   }
 }
 
 void EnumerateModulesModel::DoneScanning() {
   confirmed_bad_modules_detected_ = 0;
   suspected_bad_modules_detected_ = 0;
@@ skipping 21 matching lines @@
                            confirmed_bad_modules_detected_);
 
   // Notifications are not available in limited mode.
   if (limited_mode_)
     return;
 
   content::NotificationService::current()->Notify(
       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(
     const ModuleEnumerator::Module& module) const {
   if (!(module.recommended_action & ModuleEnumerator::SEE_LINK) &&
       !(module.recommended_action & ModuleEnumerator::NOTIFY_USER))
     return GURL();
 
   // Construct the needed hashes.
   std::string filename, location, description, signer;
   GenerateHash(base::WideToUTF8(module.name), &filename);
   GenerateHash(base::WideToUTF8(module.location), &location);
   GenerateHash(base::WideToUTF8(module.description), &description);
   GenerateHash(base::WideToUTF8(module.digital_signer), &signer);
 
   base::string16 url =
       l10n_util::GetStringFUTF16(IDS_HELP_CENTER_VIEW_CONFLICTS,
           base::ASCIIToUTF16(filename), base::ASCIIToUTF16(location),
           base::ASCIIToUTF16(description), base::ASCIIToUTF16(signer));
   return GURL(base::UTF16ToUTF8(url));
 }