| 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 a199a9f76ca9492001c4ef75fea9ac0951f45a5b..b467fdcfb9a7c24ed23c3ac811f3fe7a945791d0 100644
|
| --- a/chrome/browser/enumerate_modules_model_win.cc
|
| +++ b/chrome/browser/enumerate_modules_model_win.cc
|
| @@ -32,6 +32,7 @@
|
| #include "chrome/browser/chrome_notification_types.h"
|
| #include "chrome/browser/net/service_providers_win.h"
|
| #include "chrome/common/chrome_constants.h"
|
| +#include "chrome/common/chrome_switches.h"
|
| #include "chrome/grit/generated_resources.h"
|
| #include "content/public/browser/notification_service.h"
|
| #include "crypto/sha2.h"
|
| @@ -106,6 +107,11 @@ bool ConvertToLongPath(const base::string16& short_path,
|
| return false;
|
| }
|
|
|
| +bool SimulateBadModules() {
|
| + const base::CommandLine& cmd_line = *base::CommandLine::ForCurrentProcess();
|
| + return cmd_line.HasSwitch(switches::kSimulateBadModules);
|
| +}
|
| +
|
| } // namespace
|
|
|
| ModuleEnumerator::Module::Module() {
|
| @@ -854,7 +860,7 @@ bool EnumerateModulesModel::ShouldShowConflictWarning() const {
|
| if (conflict_notification_acknowledged_)
|
| return false;
|
|
|
| - return confirmed_bad_modules_detected_ > 0;
|
| + return SimulateBadModules() || (confirmed_bad_modules_detected_ > 0);
|
| }
|
|
|
| void EnumerateModulesModel::AcknowledgeConflictNotification() {
|
|
|