Merge 183832

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 267 matching lines @@
 // . MULTI_VALUE: a list of choices, the first of which should correspond to a
 //   deactivated state for this lab (i.e. no command line option).  To specify
 //   this type of experiment use the macro MULTI_VALUE_TYPE supplying it the
 //   array of choices.
 // See the documentation of Experiment for details on the fields.
 //
 // When adding a new choice, add it to the end of the list.
 const Experiment kExperiments[] = {
 #if defined(OS_ANDROID)
   {
-     "enable-spdy-proxy",
-     IDS_FLAGS_ENABLE_SPDY_PROXY_NAME,
-     IDS_FLAGS_ENABLE_SPDY_PROXY_DESCRIPTION,
+     "enable-spdy-proxy-auth",
+     IDS_FLAGS_ENABLE_SPDY_PROXY_AUTH_NAME,
+     IDS_FLAGS_ENABLE_SPDY_PROXY_AUTH_DESCRIPTION,
      kOsAndroid,
-     SINGLE_VALUE_TYPE(switches::kEnableSpdyProxy)
+     SINGLE_VALUE_TYPE(switches::kEnableSpdyProxyAuth)
   },
 #endif
   {
     "expose-for-tabs",  // FLAGS:RECORD_UMA
     IDS_FLAGS_TABPOSE_NAME,
     IDS_FLAGS_TABPOSE_DESCRIPTION,
     kOsMac,
 #if defined(OS_MACOSX)
     // The switch exists only on OS X.
     SINGLE_VALUE_TYPE(switches::kEnableExposeForTabs)
@@ skipping 1410 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags