Upstreaming SpdyProxy-related switches, OTR logic, and histograms

chrome/browser/profiles/profile.cc

Index: chrome/browser/profiles/profile.cc
diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
index 69d59adba5e5e83913801427f54649fd9260a94c..302ddd85cf688ce4ed9470f13b7e35ca180fb4cb 100644
--- a/chrome/browser/profiles/profile.cc
+++ b/chrome/browser/profiles/profile.cc
@@ -95,6 +95,13 @@ void Profile::RegisterUserPrefs(PrefService* prefs) {
                             "",
                             PrefService::UNSYNCABLE_PREF);
 #endif
+
+#if defined(OS_ANDROID)
+  prefs->RegisterBooleanPref(prefs::kSpdyProxyEnabled,
+                             false,
+                             PrefService::UNSYNCABLE_PREF);
+#endif
+
 }