| Index: chrome/browser/about_flags.cc
|
| diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
| index 3db20576a906217a4bbd693b3c1e55815555f910..ea093791311f79702c40fc65dda3070b8bbe7c4b 100644
|
| --- a/chrome/browser/about_flags.cc
|
| +++ b/chrome/browser/about_flags.cc
|
| @@ -439,13 +439,6 @@ const Experiment::Choice kExtensionContentVerificationChoices[] = {
|
| // When adding a new choice, add it to the end of the list.
|
| const Experiment kExperiments[] = {
|
| {
|
| - "conflicting-modules-check", // FLAGS:RECORD_UMA
|
| - IDS_FLAGS_CONFLICTS_CHECK_NAME,
|
| - IDS_FLAGS_CONFLICTS_CHECK_DESCRIPTION,
|
| - kOsWin,
|
| - SINGLE_VALUE_TYPE(switches::kConflictingModulesCheck)
|
| - },
|
| - {
|
| "ignore-gpu-blacklist",
|
| IDS_FLAGS_IGNORE_GPU_BLACKLIST_NAME,
|
| IDS_FLAGS_IGNORE_GPU_BLACKLIST_DESCRIPTION,
|
|
|