Remove Desktop Identity Consistency feature flag.

Desktop Identity Consistency has now launched and we are using a different
flag to force the Dice Identity Consistency migration. Note that this
feature flag was used in the past by some users to disable browser sign-in,
but that no longer works and the users can disable browser sign-in
from the chrome://settings/privacy

Note that this CL does not remove the corresponding finch feature as that
is still required for unit and integration tests until ForceDiceMigration
feature is rolled out.

Bug: 1021535

Change-Id: Id671b3302af3cc854f2c2decd7511f5401cd0569
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1893273Reviewed-by: Jochen Eisinger <jochen@chromium.org>
Commit-Queue: Mihai Sardarescu <msarda@chromium.org>
Cr-Commit-Position: refs/heads/master@{#713373}

chrome/browser/about_flags.cc

@@ -347,22 +347,6 @@ const FeatureEntry::Choice kUseAngleChoices[] = {
      gl::kANGLEImplementationD3D11on12Name}};
 #endif
 
-#if BUILDFLAG(ENABLE_DICE_SUPPORT)
-const FeatureEntry::FeatureParam kAccountConsistencyDice[] = {
-    {kAccountConsistencyFeatureMethodParameter,
-     kAccountConsistencyFeatureMethodDice}};
-
-const FeatureEntry::FeatureParam kAccountConsistencyDiceMigration[] = {
-    {kAccountConsistencyFeatureMethodParameter,
-     kAccountConsistencyFeatureMethodDiceMigration}};
-
-const FeatureEntry::FeatureVariation kAccountConsistencyFeatureVariations[] = {
-    {"Dice", kAccountConsistencyDice, base::size(kAccountConsistencyDice),
-     nullptr /* variation_id */},
-    {"Dice (migration)", kAccountConsistencyDiceMigration,
-     base::size(kAccountConsistencyDiceMigration), nullptr /* variation_id */}};
-#endif  // BUILDFLAG(ENABLE_DICE_SUPPORT)
-
 #if defined(OS_ANDROID)
 const FeatureEntry::Choice kReaderModeHeuristicsChoices[] = {
     {flags_ui::kGenericExperimentChoiceDefault, "", ""},
@@ -1941,11 +1925,6 @@ const FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kWebglDraftExtensionsDescription, kOsAll,
      SINGLE_VALUE_TYPE(switches::kEnableWebGLDraftExtensions)},
 #if BUILDFLAG(ENABLE_DICE_SUPPORT)
-    {"account-consistency", flag_descriptions::kAccountConsistencyName,
-     flag_descriptions::kAccountConsistencyDescription, kOsAll,
-     FEATURE_WITH_PARAMS_VALUE_TYPE(kAccountConsistencyFeature,
-                                    kAccountConsistencyFeatureVariations,
-                                    "AccountConsistencyVariations")},
     {"force-dice-migration", flag_descriptions::kForceDiceMigrationName,
      flag_descriptions::kForceDiceMigrationDescription, kOsAll,
      FEATURE_VALUE_TYPE(kForceDiceMigration)},

chrome/browser/flag_descriptions.cc

@@ -2853,13 +2853,6 @@ const char kAndroidNightModeDescription[] =
 
 #else  // !defined(OS_ANDROID)
 
-const char kAccountConsistencyName[] =
-    "Identity consistency between browser and cookie jar";
-const char kAccountConsistencyDescription[] =
-    "When enabled, the browser manages signing in and out of Google accounts.";
-const char kAccountConsistencyChoiceMirror[] = "Mirror";
-const char kAccountConsistencyChoiceDice[] = "Dice";
-
 const char kForceDiceMigrationName[] = "Force the migration to Dice";
 const char kForceDiceMigrationDescription[] =
     "When enabled the account reconcilor will force the migration to dice";

chrome/browser/flag_descriptions.h

@@ -1667,11 +1667,6 @@ extern const char kAndroidNightModeDescription[];
 
 #else  // !defined(OS_ANDROID)
 
-extern const char kAccountConsistencyName[];
-extern const char kAccountConsistencyDescription[];
-extern const char kAccountConsistencyChoiceMirror[];
-extern const char kAccountConsistencyChoiceDice[];
-
 extern const char kForceDiceMigrationName[];
 extern const char kForceDiceMigrationDescription[];