Upstreaming SpdyProxy-related switches, OTR logic, and histograms

chrome/browser/profiles/off_the_record_profile_impl.cc

Index: chrome/browser/profiles/off_the_record_profile_impl.cc
diff --git a/chrome/browser/profiles/off_the_record_profile_impl.cc b/chrome/browser/profiles/off_the_record_profile_impl.cc
index ca279e0368819315d677aa169a6a8fd0550e38e1..961c29b97f643f1323206df91dcd4b15288facfd 100644
--- a/chrome/browser/profiles/off_the_record_profile_impl.cc
+++ b/chrome/browser/profiles/off_the_record_profile_impl.cc
@@ -54,6 +54,10 @@
 #include "net/http/http_server_properties.h"
 #include "webkit/database/database_tracker.h"
 
+#if defined(OS_ANDROID)
+#include "chrome/browser/prefs/scoped_user_pref_update.h"
+#endif
+
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/preferences.h"
 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
@@ -84,6 +88,16 @@ OffTheRecordProfileImpl::OffTheRecordProfileImpl(Profile* real_profile)
       prefs_(real_profile->GetOffTheRecordPrefs()),
       ALLOW_THIS_IN_INITIALIZER_LIST(io_data_(this)),
       start_time_(Time::Now()) {
+#if defined(OS_ANDROID)

[rpetterson, 2012/09/28 18:10:58]

Is it possible to group these into a single function which you call here
(preferred) or at the very least put in a comment as to what/why you're doing to
make it clearer what's going on?

[bengr (incorrect), 2012/10/01 18:52:45]

Done.

+  const char kProxyMode[] = "mode";
+  const char kProxyServer[] = "server";
+  const char kProxyBypassList[] = "bypass_list";
+  DictionaryPrefUpdate update(prefs_, prefs::kProxy);
+  DictionaryValue* dict = update.Get();
+  dict->SetString(kProxyMode, ProxyModeToString(ProxyPrefs::MODE_SYSTEM));
+  dict->SetString(kProxyServer, "");
+  dict->SetString(kProxyBypassList, "");
+#endif
 }
 
 void OffTheRecordProfileImpl::Init() {