Upstreaming SpdyProxy-related switches, OTR logic, and histograms

chrome/common/pref_names.cc

Index: chrome/common/pref_names.cc
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index de361fdaf96961aa929d21f1e73ae64e356079b7..fe6475a5d54ff76b9dff088c16dd44874a1e68ef 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -1552,6 +1552,11 @@ const char kDevToolsVSplitLocation[] = "devtools.v_split_location";
 // Maps of files edited locally using DevTools.
 const char kDevToolsEditedFiles[] = "devtools.edited_files";
 
+#if defined(OS_ANDROID)
+// A boolean specifying whether a SPDY proxy is enabled.
+const char kSpdyProxyEnabled[] = "spdy_proxy.enabled";
+#endif
+
 // 64-bit integer serialization of the base::Time when the last sync occurred.
 const char kSyncLastSyncedTime[] = "sync.last_synced_time";
 
@@ -1746,6 +1751,10 @@ const char kAuthNegotiateDelegateWhitelist[] =
 // String that specifies the name of a custom GSSAPI library to load.
 const char kGSSAPILibraryName[] = "auth.gssapi_library_name";
 
+// String that specifies the origin allowed to use GoogleSpdyProxy
+// authentication, if any.
+const char kSpdyProxyOrigin[] = "auth.googlespdyproxy.origin";
+
 // Boolean that specifies whether to allow basic auth prompting on cross-
 // domain sub-content requests.
 const char kAllowCrossOriginAuthPrompt[] = "auth.allow_cross_origin_prompt";