Merge 183832

chrome/common/chrome_switches.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/common/chrome_switches.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 
 namespace switches {
@@ skipping 1204 matching lines @@
 const char kSimulateUpgrade[]               = "simulate-upgrade";
 
 // Replaces the buffered data source for <audio> and <video> with a simplified
 // resource loader that downloads the entire resource into memory.
 
 // Socket reuse policy. The value should be of type enum
 // ClientSocketReusePolicy.
 const char kSocketReusePolicy[]             = "socket-reuse-policy";
 
 // Origin for which SpdyProxy authentication is supported.
-const char kSpdyProxyOrigin[]               = "spdy-proxy-origin";
+const char kSpdyProxyAuthOrigin[]           = "spdy-proxy-auth-origin";
 
 // Speculative resource prefetching.
 const char kSpeculativeResourcePrefetching[] =
     "speculative-resource-prefetching";
 
 // Speculative resource prefetching is disabled.
 const char kSpeculativeResourcePrefetchingDisabled[] = "disabled";
 
 // Speculative resource prefetching will only learn about resources that need to
 // be prefetched but will not prefetch them.
@@ skipping 155 matching lines @@
 // use Chromium's network stack to fetch, and V8 to evaluate.
 const char kWinHttpProxyResolver[]          = "winhttp-proxy-resolver";
 
 #if defined(ENABLE_PLUGIN_INSTALLATION)
 // Specifies a custom URL for fetching plug-ins metadata. Used for testing.
 const char kPluginsMetadataServerURL[]      = "plugins-metadata-server-url";
 #endif
 
 #if defined(OS_ANDROID)
 // Enable SPDY proxy.
-const char kEnableSpdyProxy[]               = "enable-spdy-proxy";
+const char kEnableSpdyProxyAuth[]           = "enable-spdy-proxy-auth";
 
 // Pops the translate infobar if possible.
 const char kEnableTranslate[]               = "enable-translate";
 
 // Uses the tablet specific UI components when available.
 const char kTabletUI[]                      = "tablet-ui";
 #endif
 
 #if defined(USE_ASH)
 const char kAshEnableTabScrubbing[]            = "ash-enable-tab-scrubbing";
@@ skipping 245 matching lines @@
 
 // -----------------------------------------------------------------------------
 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE.
 //
 // You were going to just dump your switches here, weren't you? Instead, please
 // put them in alphabetical order above, or in order inside the appropriate
 // ifdef at the bottom. The order should match the header.
 // -----------------------------------------------------------------------------
 
 }  // namespace switches