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

chrome/browser/policy/managed_prefs_banner_base.cc

 // Copyright (c) 2011 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/policy/managed_prefs_banner_base.h"
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/pref_set_observer.h"
 #include "chrome/common/notification_details.h"
@@ skipping 69 matching lines @@
       break;
     case OPTIONS_PAGE_ADVANCED:
       AddUserPref(prefs::kAlternateErrorPagesEnabled);
       AddUserPref(prefs::kSearchSuggestEnabled);
       AddUserPref(prefs::kDnsPrefetchingEnabled);
       AddUserPref(prefs::kDisableSpdy);
       AddUserPref(prefs::kSafeBrowsingEnabled);
 #if defined(GOOGLE_CHROME_BUILD)
       AddLocalStatePref(prefs::kMetricsReportingEnabled);
 #endif
-      AddUserPref(prefs::kProxyMode);
-      AddUserPref(prefs::kProxyServer);
-      AddUserPref(prefs::kProxyPacUrl);
-      AddUserPref(prefs::kProxyBypassList);
+      AddUserPref(prefs::kProxy);
       AddUserPref(prefs::kCloudPrintProxyEnabled);
       break;
     default:
       NOTREACHED();
   }
 }
 
 void ManagedPrefsBannerBase::Observe(NotificationType type,
                                      const NotificationSource& source,
                                      const NotificationDetails& details) {
   if (NotificationType::PREF_CHANGED == type) {
     std::string* pref = Details<std::string>(details).ptr();
     if (pref && (local_state_set_->IsObserved(*pref) ||
                  user_pref_set_->IsObserved(*pref)))
       OnUpdateVisibility();
   }
 }
 
 }  // namespace policy