Upstreaming SpdyProxy-related switches, OTR logic, and histograms

chrome/common/chrome_switches.cc

Index: chrome/common/chrome_switches.cc
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index a968fe5b2de1b77ec5d317dcfbbecec68c1c1a3f..cca49bc0687d266d98b499f8596f760d7d8c33e0 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -1351,6 +1351,9 @@ const char kWindowSize[]                    = "window-size";
 // use Chromium's network stack to fetch, and V8 to evaluate.
 const char kWinHttpProxyResolver[]          = "winhttp-proxy-resolver";
 
+// Origin for which GoogleSpdyProxy authentication is supported.
+const char kSpdyProxyOrigin[]               = "spdy-proxy-origin";
+
 #if defined(OS_ANDROID)
 // Use the tablet specific UI components when available.
 const char kTabletUI[]                      = "tablet-ui";