Merge 176800

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 867 matching lines @@
   {
     "app-list-show-apps-only",
     IDS_FLAGS_ENABLE_APP_LIST_SHOW_APPS_ONLY_NAME,
     IDS_FLAGS_ENABLE_APP_LIST_SHOW_APPS_ONLY_DESCRIPTION,
     kOsAll,
     SINGLE_VALUE_TYPE(app_list::switches::kAppListShowAppsOnly),
   },
 #endif  // defined(USE_ASH)
 #if defined(OS_CHROMEOS)
   {
+    "force-oauth1",
+    IDS_FLAGS_FORCE_OAUTH1_DISPLAY_NAME,
+    IDS_FLAGS_FORCE_OAUTH1_DISPLAY_DESCRIPTION,
+    kOsCrOS,
+    SINGLE_VALUE_TYPE(::switches::kForceOAuth1),
+  },
+  {
     "disable-new-oobe",
     IDS_FLAGS_DISABLE_NEW_OOBE,
     IDS_FLAGS_DISABLE_NEW_OOBE_DESCRIPTION,
     kOsCrOS,
     SINGLE_VALUE_TYPE(switches::kDisableNewOobe),
   },
   {
       "disable-new-password-changed-dialog",
       IDS_FLAGS_DISABLE_NEW_PASSWORD_CHANGED_DIALOG,
       IDS_FLAGS_DISABLE_NEW_PASSWORD_CHANGED_DIALOG_DESCRIPTION,
@@ skipping 704 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags