Upstreaming SpdyProxy-related switches, OTR logic, and histograms

chrome/browser/profiles/profile.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/profiles/profile.h"
 
 #include <string>
 
 #include "build/build_config.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 77 matching lines @@
   prefs->RegisterStringPref(prefs::kApplicationLocale,
                             "",
                             PrefService::SYNCABLE_PREF);
   prefs->RegisterStringPref(prefs::kApplicationLocaleBackup,
                             "",
                             PrefService::UNSYNCABLE_PREF);
   prefs->RegisterStringPref(prefs::kApplicationLocaleAccepted,
                             "",
                             PrefService::UNSYNCABLE_PREF);
 #endif
+
+#if defined(OS_ANDROID)
+  prefs->RegisterBooleanPref(prefs::kSpdyProxyEnabled,
+                             false,
+                             PrefService::UNSYNCABLE_PREF);
+#endif
+
 }
 
 
 std::string Profile::GetDebugName() {
   std::string name = GetPath().BaseName().MaybeAsASCII();
   if (name.empty()) {
     name = "UnknownProfile";
   }
   return name;
 }
@@ skipping 16 matching lines @@
 
 void Profile::MaybeSendDestroyedNotification() {
   if (!sent_destroyed_notification_) {
     sent_destroyed_notification_ = true;
     content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_PROFILE_DESTROYED,
         content::Source<Profile>(this),
         content::NotificationService::NoDetails());
   }
 }