Remove options to disable deadline scheduling

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 2908db8adb286a3f3d5851ce94ab82c6d710b294..1b3b6d73df0c5395b963816d6b40ae2cc45625bc 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -31,7 +31,6 @@
 #include "media/base/media_switches.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/ui_base_switches.h"
-#include "ui/compositor/compositor_switches.h"
 #include "ui/events/event_switches.h"
 #include "ui/gfx/switches.h"
 #include "ui/gl/gl_switches.h"
@@ -205,22 +204,6 @@ const Experiment::Choice kImplSidePaintingChoices[] = {
     cc::switches::kDisableImplSidePainting, ""}
 };
 
-const Experiment::Choice kDeadlineSchedulingChoices[] = {
-  { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
-  { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
-    switches::kEnableDeadlineScheduling, ""},
-  { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
-    switches::kDisableDeadlineScheduling, ""}
-};
-
-const Experiment::Choice kUIDeadlineSchedulingChoices[] = {
-  { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
-  { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
-    switches::kUIEnableDeadlineScheduling, ""},
-  { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
-    switches::kUIDisableDeadlineScheduling, ""}
-};
-
 const Experiment::Choice kLCDTextChoices[] = {
   { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
   { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, cc::switches::kEnableLCDText, ""},
@@ -1438,23 +1421,6 @@ const Experiment kExperiments[] = {
     MULTI_VALUE_TYPE(kImplSidePaintingChoices)
   },
   {
-    "deadline-scheduling",
-    IDS_FLAGS_DEADLINE_SCHEDULING_NAME,
-    IDS_FLAGS_DEADLINE_SCHEDULING_DESCRIPTION,
-    kOsMac | kOsWin | kOsLinux | kOsCrOS | kOsAndroid,
-    MULTI_VALUE_TYPE(kDeadlineSchedulingChoices)
-  },
-  {
-    "ui-deadline-scheduling",
-    IDS_FLAGS_UI_DEADLINE_SCHEDULING_NAME,
-    IDS_FLAGS_UI_DEADLINE_SCHEDULING_DESCRIPTION,
-#ifdef USE_AURA
-    kOsWin | kOsLinux |
-#endif
-    kOsCrOS,
-    MULTI_VALUE_TYPE(kUIDeadlineSchedulingChoices)
-  },
-  {
     "lcd-text-aa",
     IDS_FLAGS_LCD_TEXT_NAME,
     IDS_FLAGS_LCD_TEXT_DESCRIPTION,