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

chrome/browser/prefs/proxy_prefs_unittest.cc

Index: chrome/browser/prefs/proxy_prefs_unittest.cc
diff --git a/chrome/browser/prefs/proxy_prefs_unittest.cc b/chrome/browser/prefs/proxy_prefs_unittest.cc
index 72aa0f199cb54d1444310e2e2cfe32c254081945..bc0ba5f9aa1fa44d5fe7d69207baaca469ab44bb 100644
--- a/chrome/browser/prefs/proxy_prefs_unittest.cc
+++ b/chrome/browser/prefs/proxy_prefs_unittest.cc
@@ -5,11 +5,19 @@
 #include <string>
 
 #include "base/logging.h"
+#include "base/scoped_ptr.h"
 #include "base/values.h"
 #include "base/version.h"
 #include "chrome/browser/prefs/proxy_prefs.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+struct ProxyPrefsHolder {
+  ProxyPrefs::ProxyMode mode;
+  std::string pac_url;
+  std::string proxy_server;
+  std::string bypass_list;
+};
+
 TEST(ProxyPrefsTest, StringToProxyMode) {
   ProxyPrefs::ProxyMode mode;
   EXPECT_TRUE(ProxyPrefs::StringToProxyMode("direct", &mode));
@@ -50,3 +58,69 @@ TEST(ProxyPrefsTest, IntToProxyMode) {
   EXPECT_FALSE(ProxyPrefs::IntToProxyMode(-1, &mode));
   EXPECT_FALSE(ProxyPrefs::IntToProxyMode(ProxyPrefs::kModeCount, &mode));
 }
+
+TEST(ProxyPrefsTest, CreateDirect) {
+  scoped_ptr<DictionaryValue> dict_value(ProxyPrefsDictionary::CreateDirect());
+  ProxyPrefsDictionary dict(dict_value.get());
+  ProxyPrefsHolder h;
+
+  ASSERT_TRUE(dict.GetMode(&h.mode));
+  EXPECT_EQ(ProxyPrefs::MODE_DIRECT, h.mode);
+  ASSERT_FALSE(dict.GetPacUrl(&h.bypass_list));
+  ASSERT_FALSE(dict.GetProxyServer(&h.proxy_server));
+  ASSERT_FALSE(dict.GetBypassList(&h.bypass_list));
+}
+
+TEST(ProxyPrefsTest, CreateAutoDetect) {
+  scoped_ptr<DictionaryValue> dict_value(
+      ProxyPrefsDictionary::CreateAutoDetect());
+  ProxyPrefsDictionary dict(dict_value.get());
+  ProxyPrefsHolder h;
+
+  ASSERT_TRUE(dict.GetMode(&h.mode));
+  EXPECT_EQ(ProxyPrefs::MODE_AUTO_DETECT, h.mode);
+  ASSERT_FALSE(dict.GetPacUrl(&h.bypass_list));
+  ASSERT_FALSE(dict.GetProxyServer(&h.proxy_server));
+  ASSERT_FALSE(dict.GetBypassList(&h.bypass_list));
+}
+
+TEST(ProxyPrefsTest, CreatePacScript) {
+  scoped_ptr<DictionaryValue> dict_value(
+      ProxyPrefsDictionary::CreatePacScript("pac"));
+  ProxyPrefsDictionary dict(dict_value.get());
+  ProxyPrefsHolder h;
+
+  ASSERT_TRUE(dict.GetMode(&h.mode));
+  EXPECT_EQ(ProxyPrefs::MODE_PAC_SCRIPT, h.mode);
+  ASSERT_TRUE(dict.GetPacUrl(&h.bypass_list));
+  EXPECT_EQ("pac", h.bypass_list);
+  ASSERT_FALSE(dict.GetProxyServer(&h.proxy_server));
+  ASSERT_FALSE(dict.GetBypassList(&h.bypass_list));
+}
+
+TEST(ProxyPrefsTest, CreateFixedServers) {
+  scoped_ptr<DictionaryValue> dict_value(
+      ProxyPrefsDictionary::CreateFixedServers("http://1.2.3.4", "http://foo"));
+  ProxyPrefsDictionary dict(dict_value.get());
+  ProxyPrefsHolder h;
+
+  ASSERT_TRUE(dict.GetMode(&h.mode));
+  EXPECT_EQ(ProxyPrefs::MODE_FIXED_SERVERS, h.mode);
+  ASSERT_FALSE(dict.GetPacUrl(&h.bypass_list));
+  ASSERT_TRUE(dict.GetProxyServer(&h.proxy_server));
+  EXPECT_EQ("http://1.2.3.4", h.proxy_server);
+  ASSERT_TRUE(dict.GetBypassList(&h.bypass_list));
+  EXPECT_EQ("http://foo", h.bypass_list);
+}
+
+TEST(ProxyPrefsTest, CreateSystem) {
+  scoped_ptr<DictionaryValue> dict_value(ProxyPrefsDictionary::CreateSystem());
+  ProxyPrefsDictionary dict(dict_value.get());
+  ProxyPrefsHolder h;
+
+  ASSERT_TRUE(dict.GetMode(&h.mode));
+  EXPECT_EQ(ProxyPrefs::MODE_SYSTEM, h.mode);
+  ASSERT_FALSE(dict.GetPacUrl(&h.bypass_list));
+  ASSERT_FALSE(dict.GetProxyServer(&h.proxy_server));
+  ASSERT_FALSE(dict.GetBypassList(&h.bypass_list));
+}