Cleanup legacy flags and switches

chrome/browser/about_flags.cc

Index: chrome/browser/about_flags.cc
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index fbb1e8d9e1ab6a48ce88707c89d60b9ef2878cda..9b398c599ce9b4ef32434eda3778d3b7e1163b5d 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -166,13 +166,6 @@ const Experiment::Choice kNaClDebugMaskChoices[] = {
 };
 
 #if defined(OS_CHROMEOS)
-const Experiment::Choice kAshBootAnimationFunction[] = {
-  { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
-  { IDS_FLAGS_ASH_BOOT_ANIMATION_FUNCTION2,
-    ash::switches::kAshBootAnimationFunction2, ""},
-  { IDS_FLAGS_ASH_BOOT_ANIMATION_FUNCTION3,
-    ash::switches::kAshBootAnimationFunction3, ""}
-};
 
 const Experiment::Choice kChromeCaptivePortalDetectionChoices[] = {
   { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
@@ -1039,20 +1032,6 @@ const Experiment kExperiments[] = {
     SINGLE_VALUE_TYPE(chromeos::switches::kDisableBootAnimation),
   },
   {
-    "disable-boot-animation2",
-    IDS_FLAGS_DISABLE_BOOT_ANIMATION2,
-    IDS_FLAGS_DISABLE_BOOT_ANIMATION2_DESCRIPTION,
-    kOsCrOSOwnerOnly,
-    SINGLE_VALUE_TYPE(ash::switches::kAshDisableBootAnimation2),
-  },
-  {
-    "boot-animation-fucntion",
-    IDS_FLAGS_ASH_BOOT_ANIMATION_FUNCTION,
-    IDS_FLAGS_ASH_BOOT_ANIMATION_FUNCTION_DESCRIPTION,
-    kOsCrOSOwnerOnly,
-    MULTI_VALUE_TYPE(kAshBootAnimationFunction),
-  },
-  {
     "captive-portal-detector",
     IDS_FLAGS_CAPTIVE_PORTAL_DETECTOR_NAME,
     IDS_FLAGS_CAPTIVE_PORTAL_DETECTOR_DESCRIPTION,