Upstreaming SpdyProxy-related switches, OTR logic, and histograms

chrome/browser/ui/prefs/prefs_tab_helper.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
 
 #include <string>
 
 #include "base/string_util.h"
 #include "base/stringprintf.h"
@@ skipping 366 matching lines @@
 PrefsTabHelper::~PrefsTabHelper() {
 }
 
 // static
 void PrefsTabHelper::InitIncognitoUserPrefStore(
     OverlayUserPrefStore* pref_store) {
   // List of keys that cannot be changed in the user prefs file by the incognito
   // profile.  All preferences that store information about the browsing history
   // or behavior of the user should have this property.
   pref_store->RegisterOverlayPref(prefs::kBrowserWindowPlacement);
+#if defined(OS_ANDROID)
+  pref_store->RegisterOverlayPref(prefs::kProxy);
+#endif
 }
 
 // static
 void PrefsTabHelper::RegisterUserPrefs(PrefService* prefs) {
   WebPreferences pref_defaults;
   prefs->RegisterBooleanPref(prefs::kWebKitJavascriptEnabled,
                              pref_defaults.javascript_enabled,
                              PrefService::UNSYNCABLE_PREF);
   prefs->RegisterBooleanPref(prefs::kWebKitWebSecurityEnabled,
                              pref_defaults.web_security_enabled,
@@ skipping 147 matching lines @@
 
 void PrefsTabHelper::UpdateRendererPreferences() {
   renderer_preferences_util::UpdateFromSystemSettings(
       web_contents_->GetMutableRendererPrefs(), GetProfile());
   web_contents_->GetRenderViewHost()->SyncRendererPrefs();
 }
 
 Profile* PrefsTabHelper::GetProfile() {
   return Profile::FromBrowserContext(web_contents_->GetBrowserContext());
 }