Merge 183832

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 "base/prefs/pref_service.h"
 #include "build/build_config.h"
@@ skipping 86 matching lines @@
                                PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterStringPref(prefs::kApplicationLocaleAccepted,
                                std::string(),
                                PrefRegistrySyncable::UNSYNCABLE_PREF);
 #endif
 
 #if defined(OS_ANDROID)
   registry->RegisterBooleanPref(prefs::kDevToolsRemoteEnabled,
                                 false,
                                 PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterBooleanPref(prefs::kSpdyProxyEnabled,
+  registry->RegisterBooleanPref(prefs::kSpdyProxyAuthEnabled,
                                 false,
                                 PrefRegistrySyncable::UNSYNCABLE_PREF);
 #endif
 }
 
 
 std::string Profile::GetDebugName() {
   std::string name = GetPath().BaseName().MaybeAsASCII();
   if (name.empty()) {
     name = "UnknownProfile";
@@ skipping 18 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());
   }
 }