Upstreaming SpdyProxy-related switches, OTR logic, and histograms

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 0540dadfb922be88ac58baa8e72da529061be61e..dc24fb25098ab2a218f14d7917e9124d7459eee6 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -846,6 +846,9 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
       switches::kProfilingFlush,
       switches::kRecordMode,
       switches::kSilentDumpOnDCHECK,
+#if defined(OS_ANDROID)
+      switches::kSpdyProxyOrigin,
+#endif
       switches::kWhitelistedExtensionID,
     };
 
@@ -855,6 +858,9 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
     static const char* const kSwitchNames[] = {
       switches::kAllowHTTPBackgroundPage,
       switches::kEnableExperimentalExtensionApis,
+#if defined(OS_ANDROID)
+      switches::kSpdyProxyOrigin,
+#endif
       switches::kWhitelistedExtensionID,
     };