Merge 150797 - Revert 148201 - Re-enable OTP sign in on trunk by reverting most of 147297.

chrome/browser/about_flags.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/about_flags.h"
 
 #include <algorithm>
 #include <iterator>
 #include <map>
 #include <set>
@@ skipping 720 matching lines @@
 #if defined(OS_CHROMEOS)
   {
     "allow-touchpad-three-finger-click",
     IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_NAME,
     IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_DESCRIPTION,
     kOsCrOS,
     SINGLE_VALUE_TYPE(switches::kEnableTouchpadThreeFingerClick)
   },
 #endif
   {
-    "disable-client-oauth-signin",
-    IDS_FLAGS_DISABLE_CLIENT_OAUTH_SIGNIN_NAME,
-    IDS_FLAGS_DISABLE_CLIENT_OAUTH_SIGNIN_DESCRIPTION,
+    "enable-client-oauth-signin",
+    IDS_FLAGS_ENABLE_CLIENT_OAUTH_SIGNIN_NAME,
+    IDS_FLAGS_ENABLE_CLIENT_OAUTH_SIGNIN_DESCRIPTION,
     kOsMac | kOsWin | kOsLinux,
-    SINGLE_VALUE_TYPE(switches::kDisableClientOAuthSignin)
+    SINGLE_VALUE_TYPE(switches::kEnableClientOAuthSignin)
   },
 #if defined(USE_ASH)
   {
     "show-launcher-alignment-menu",
     IDS_FLAGS_SHOW_LAUNCHER_ALIGNMENT_MENU_NAME,
     IDS_FLAGS_SHOW_LAUNCHER_ALIGNMENT_MENU_DESCRIPTION,
     kOsAll,
     SINGLE_VALUE_TYPE(switches::kShowLauncherAlignmentMenu)
   },
   {
@@ skipping 564 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags