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

chrome/browser/prefs/proxy_config_dictionary_unittest.cc

Index: chrome/browser/prefs/proxy_config_dictionary_unittest.cc
diff --git a/chrome/browser/prefs/proxy_config_dictionary_unittest.cc b/chrome/browser/prefs/proxy_config_dictionary_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..07c67435497d4d384874d16ee7862aa505c7e368
--- /dev/null
+++ b/chrome/browser/prefs/proxy_config_dictionary_unittest.cc
@@ -0,0 +1,84 @@
+// 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 <string>
+
+#include "base/scoped_ptr.h"
+#include "base/values.h"
+#include "chrome/browser/prefs/proxy_config_dictionary.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+struct ProxyConfigHolder {
+  ProxyPrefs::ProxyMode mode;
+  std::string pac_url;
+  std::string proxy_server;
+  std::string bypass_list;
+};
+
+TEST(ProxyConfigDictionaryTest, CreateDirect) {
+  scoped_ptr<DictionaryValue> dict_value(ProxyConfigDictionary::CreateDirect());
+  ProxyConfigDictionary dict(dict_value.get());
+  ProxyConfigHolder 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(ProxyConfigDictionaryTest, CreateAutoDetect) {
+  scoped_ptr<DictionaryValue> dict_value(
+      ProxyConfigDictionary::CreateAutoDetect());
+  ProxyConfigDictionary dict(dict_value.get());
+  ProxyConfigHolder 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(ProxyConfigDictionaryTest, CreatePacScript) {
+  scoped_ptr<DictionaryValue> dict_value(
+      ProxyConfigDictionary::CreatePacScript("pac"));
+  ProxyConfigDictionary dict(dict_value.get());
+  ProxyConfigHolder 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(ProxyConfigDictionaryTest, CreateFixedServers) {
+  scoped_ptr<DictionaryValue> dict_value(
+      ProxyConfigDictionary::CreateFixedServers("http://1.2.3.4",
+                                                "http://foo"));
+  ProxyConfigDictionary dict(dict_value.get());
+  ProxyConfigHolder 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(ProxyConfigDictionaryTest, CreateSystem) {
+  scoped_ptr<DictionaryValue> dict_value(ProxyConfigDictionary::CreateSystem());
+  ProxyConfigDictionary dict(dict_value.get());
+  ProxyConfigHolder 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));
+}