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

chrome/browser/prefs/proxy_prefs.h

 // 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.
 
 #ifndef CHROME_BROWSER_PREFS_PROXY_PREFS_H_
 #define CHROME_BROWSER_PREFS_PROXY_PREFS_H_
 #pragma once
 
 #include <string>
 
+#include "base/values.h"
+
 namespace ProxyPrefs {
 
 // Possible types of specifying proxy settings. Do not change the order of
 // the constants, because numeric values are exposed to users.
 // If you add an enum constant, you should also add a string to
 // kProxyModeNames in the .cc file.
 enum ProxyMode {
   // Direct connection to the network, other proxy preferences are ignored.
   MODE_DIRECT = 0,
 
@@ skipping 22 matching lines @@
 extern const char kPacScriptProxyModeName[];
 extern const char kFixedServersProxyModeName[];
 extern const char kSystemProxyModeName[];
 
 bool IntToProxyMode(int in_value, ProxyMode* out_value);
 bool StringToProxyMode(const std::string& in_value,
                        ProxyMode* out_value);
 
 }  // namespace ProxyPrefs
 
+// Factory and wrapper for proxy preferences dictionaries that are stored
+// in the user preferences. The dictionary has the following structure:
+// {
+//   mode: string,
+//   server: string,
+//   pac_url: string,
+//   bypass_list: string
+// }
+// See proxy_prefs.cc for the structure of the respective strings.
+class ProxyPrefsDictionary {

[danno, 2011/02/04 10:32:13]

How about putting this in the ProxyPrefs namespace and calling in
ProxyConfigDictionary? 

[battre, 2011/02/07 14:13:47]

I have renamed ProxyPrefsDictionary to ProxyConfigDictionary, but I have moved
it into a new file such that class name and file name match.

Done.

+ public:
+  explicit ProxyPrefsDictionary(const DictionaryValue* dict);
+
+  bool GetMode(ProxyPrefs::ProxyMode* out) const;
+  bool GetPacUrl(std::string* out) const;
+  bool GetProxyServer(std::string* out) const;
+  bool GetBypassList(std::string* out) const;
+
+  static DictionaryValue* CreateDirect();
+  static DictionaryValue* CreateAutoDetect();
+  static DictionaryValue* CreatePacScript(const std::string& pac_url);
+  static DictionaryValue* CreateFixedServers(
+      const std::string& proxy_server,
+      const std::string& bypass_list);
+  static DictionaryValue* CreateSystem();
+ private:
+  static DictionaryValue* CreateDictionary(ProxyPrefs::ProxyMode mode,
+                                           const std::string& pac_url,
+                                           const std::string& proxy_server,
+                                           const std::string& bypass_list);
+
+  const DictionaryValue* dict_;  // weak pointer

[danno, 2011/02/04 10:32:13]

Would it not be better/safer to copy the dictionary and own the copy?

[battre, 2011/02/07 14:13:47]

Done.

+
+  DISALLOW_COPY_AND_ASSIGN(ProxyPrefsDictionary);
+};
+
 #endif  // CHROME_BROWSER_PREFS_PROXY_PREFS_H_