Revert 143931 - Enable Pointer Lock by default, change about:flags option to multi-select.

chrome/browser/about_flags.cc

Index: chrome/browser/about_flags.cc
===================================================================
--- chrome/browser/about_flags.cc	(revision 144010)
+++ chrome/browser/about_flags.cc	(working copy)
@@ -131,15 +131,7 @@
     switches::kTouchOptimizedUIDisabled }
 };
 
-const Experiment::Choice kPointerLockUIChoices[] = {
-  { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
-  { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
-    switches::kEnablePointerLock, ""},
-  { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
-    switches::kDisablePointerLock, ""}
-};
 
-
 // RECORDING USER METRICS FOR FLAGS:
 // -----------------------------------------------------------------------------
 // The first line of the experiment is the internal name. If you'd like to
@@ -526,7 +518,7 @@
     IDS_FLAGS_ENABLE_POINTER_LOCK_NAME,
     IDS_FLAGS_ENABLE_POINTER_LOCK_DESCRIPTION,
     kOsAll,
-    MULTI_VALUE_TYPE(kPointerLockUIChoices)
+    SINGLE_VALUE_TYPE(switches::kEnablePointerLock)
   },
 #if defined(USE_ASH)
   {
Property changes on: chrome/browser/about_flags.cc
___________________________________________________________________
Deleted: svn:mergeinfo