Make proxy settings one atomic dictionary in the PrefStores such that modifications are atomic.

chrome/browser/prefs/pref_set_observer.cc

 // Copyright (c) 2010 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/prefs/pref_set_observer.h"
 
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
 
 PrefSetObserver::PrefSetObserver(PrefService* pref_service,
@@ skipping 29 matching lines @@
       return true;
   }
   return false;
 }
 
 // static
 PrefSetObserver* PrefSetObserver::CreateProxyPrefSetObserver(
     PrefService* pref_service,
     NotificationObserver* observer) {
   PrefSetObserver* pref_set = new PrefSetObserver(pref_service, observer);
-  pref_set->AddPref(prefs::kProxyMode);
-  pref_set->AddPref(prefs::kProxyServer);
-  pref_set->AddPref(prefs::kProxyPacUrl);
-  pref_set->AddPref(prefs::kProxyBypassList);
+  pref_set->AddPref(prefs::kProxy);
 
   return pref_set;
 }
 
 // static
 PrefSetObserver* PrefSetObserver::CreateDefaultSearchPrefSetObserver(
     PrefService* pref_service,
     NotificationObserver* observer) {
   PrefSetObserver* pref_set = new PrefSetObserver(pref_service, observer);
   pref_set->AddPref(prefs::kDefaultSearchProviderEnabled);
   pref_set->AddPref(prefs::kDefaultSearchProviderName);
   pref_set->AddPref(prefs::kDefaultSearchProviderKeyword);
   pref_set->AddPref(prefs::kDefaultSearchProviderSearchURL);
   pref_set->AddPref(prefs::kDefaultSearchProviderSuggestURL);
   pref_set->AddPref(prefs::kDefaultSearchProviderIconURL);
   pref_set->AddPref(prefs::kDefaultSearchProviderInstantURL);
   pref_set->AddPref(prefs::kDefaultSearchProviderEncodings);
 
   return pref_set;
 }
 
 void PrefSetObserver::Observe(NotificationType type,
                               const NotificationSource& source,
                               const NotificationDetails& details) {
   if (observer_)
     observer_->Observe(type, source, details);
 }