Make sure we don't trigger the incompatibility badge when the flag....

chrome/browser/enumerate_modules_model_win.cc

 // Copyright (c) 2011 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 "app/l10n_util.h"
@@ skipping 824 matching lines @@
   }
 
   scanning_ = false;
   lock->Release();
 
   HISTOGRAM_COUNTS_100("Conflicts.SuspectedBadModules",
                        suspected_bad_modules_detected_);
   HISTOGRAM_COUNTS_100("Conflicts.ConfirmedBadModules",
                        confirmed_bad_modules_detected_);
 
-  if (!limited_mode_) {
+  // Notifications are not available in limited mode.
+  if (limited_mode_)
+    return;
+
+  NotificationService::current()->Notify(
+      NotificationType::MODULE_LIST_ENUMERATED,
+      Source<EnumerateModulesModel>(this),
+      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;
+
+  if (suspected_bad_modules_detected_ || confirmed_bad_modules_detected_) {
+    bool found_confirmed_bad_modules = confirmed_bad_modules_detected_  > 0;
     NotificationService::current()->Notify(
-        NotificationType::MODULE_LIST_ENUMERATED,
+        NotificationType::MODULE_INCOMPATIBILITY_DETECTED,
         Source<EnumerateModulesModel>(this),
-        NotificationService::NoDetails());
-
-    if (suspected_bad_modules_detected_ || confirmed_bad_modules_detected_) {
-      bool found_confirmed_bad_modules = confirmed_bad_modules_detected_  > 0;
-      NotificationService::current()->Notify(
-          NotificationType::MODULE_INCOMPATIBILITY_DETECTED,
-          Source<EnumerateModulesModel>(this),
-          Details<bool>(&found_confirmed_bad_modules));
-    }
+        Details<bool>(&found_confirmed_bad_modules));
   }
 }
 
 GURL EnumerateModulesModel::ConstructHelpCenterUrl(
     const ModuleEnumerator::Module& module) {
   if (!(module.recommended_action & ModuleEnumerator::SEE_LINK))
     return GURL();
 
   // Construct the needed hashes.
   std::string filename, location, description, signer;
   GenerateHash(WideToUTF8(module.name), &filename);
   GenerateHash(WideToUTF8(module.location), &location);
   GenerateHash(WideToUTF8(module.description), &description);
   GenerateHash(WideToUTF8(module.digital_signer), &signer);
 
   string16 url = l10n_util::GetStringFUTF16(IDS_HELP_CENTER_VIEW_CONFLICTS,
       ASCIIToUTF16(filename), ASCIIToUTF16(location),
       ASCIIToUTF16(description), ASCIIToUTF16(signer));
   return GURL(UTF16ToUTF8(url));
 }