Upstreaming SpdyProxy-related switches, OTR logic, and histograms

chrome/common/pref_names.h

Index: chrome/common/pref_names.h
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index 1d4bb5a7a2898120ddcf59d2ce081b5e473ebb45..30c5a3029977f42a4b03f37cb6609e557b154ed3 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -542,6 +542,9 @@ extern const char kDevToolsOpenDocked[];
 extern const char kDevToolsDockSide[];
 extern const char kDevToolsHSplitLocation[];
 extern const char kDevToolsVSplitLocation[];
+#if defined(OS_ANDROID)
+extern const char kSpdyProxyEnabled[];
+#endif
 extern const char kDevToolsEditedFiles[];
 
 extern const char kSyncLastSyncedTime[];
@@ -689,6 +692,8 @@ extern const char kEnableAuthNegotiatePort[];
 extern const char kAuthServerWhitelist[];
 extern const char kAuthNegotiateDelegateWhitelist[];
 extern const char kGSSAPILibraryName[];
+extern const char kSpdyProxyOrigin[];
+
 extern const char kAllowCrossOriginAuthPrompt[];
 
 extern const char kRegisteredProtocolHandlers[];