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

chrome/browser/prefs/command_line_pref_store_unittest.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 <gtest/gtest.h>
 
 #include "app/app_switches.h"
 #include "base/command_line.h"
 #include "base/ref_counted.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/prefs/command_line_pref_store.h"
 #include "chrome/browser/prefs/proxy_prefs.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "ui/base/ui_base_switches.h"
 
 namespace {
 
 class TestCommandLinePrefStore : public CommandLinePrefStore {
  public:
   explicit TestCommandLinePrefStore(CommandLine* cl)
       : CommandLinePrefStore(cl) {}
 
   bool ProxySwitchesAreValid() {
     return ValidateProxySwitches();
   }
 
-  void VerifyIntPref(const std::string& path, int expected_value) {
-    Value* actual = NULL;
-    ASSERT_EQ(PrefStore::READ_OK, GetValue(path, &actual));
-    EXPECT_TRUE(FundamentalValue(expected_value).Equals(actual));
+  void VerifyProxyMode(ProxyPrefs::ProxyMode expected_mode) {
+    Value* value = NULL;
+    ASSERT_EQ(PrefStore::READ_OK, GetValue(prefs::kProxy, &value));
+    ASSERT_EQ(Value::TYPE_DICTIONARY, value->GetType());
+    ProxyPrefsDictionary dict(static_cast<DictionaryValue*>(value));
+    ProxyPrefs::ProxyMode actual_mode;
+    ASSERT_TRUE(dict.GetMode(&actual_mode));
+    EXPECT_EQ(expected_mode, actual_mode);
   }
 };
 
 const char unknown_bool[] = "unknown_switch";
 const char unknown_string[] = "unknown_other_switch";
 
 }  // namespace
 
 // Tests a simple string pref on the command line.
 TEST(CommandLinePrefStoreTest, SimpleStringPref) {
   CommandLine cl(CommandLine::NO_PROGRAM);
   cl.AppendSwitchASCII(switches::kLang, "hi-MOM");
   scoped_refptr<CommandLinePrefStore> store = new CommandLinePrefStore(&cl);
 
   Value* actual = NULL;
   EXPECT_EQ(PrefStore::READ_OK,
             store->GetValue(prefs::kApplicationLocale, &actual));
   std::string result;
   EXPECT_TRUE(actual->GetAsString(&result));
   EXPECT_EQ("hi-MOM", result);
 }
 
 // Tests a simple boolean pref on the command line.
 TEST(CommandLinePrefStoreTest, SimpleBooleanPref) {
   CommandLine cl(CommandLine::NO_PROGRAM);
   cl.AppendSwitch(switches::kNoProxyServer);
   scoped_refptr<TestCommandLinePrefStore> store =
       new TestCommandLinePrefStore(&cl);
 
-  store->VerifyIntPref(prefs::kProxyMode, ProxyPrefs::MODE_DIRECT);
+  store->VerifyProxyMode(ProxyPrefs::MODE_DIRECT);
 }
 
 // Tests a command line with no recognized prefs.
 TEST(CommandLinePrefStoreTest, NoPrefs) {
   CommandLine cl(CommandLine::NO_PROGRAM);
   cl.AppendSwitch(unknown_string);
   cl.AppendSwitchASCII(unknown_bool, "a value");
   scoped_refptr<CommandLinePrefStore> store = new CommandLinePrefStore(&cl);
 
   Value* actual = NULL;
   EXPECT_EQ(PrefStore::READ_NO_VALUE, store->GetValue(unknown_bool, &actual));
   EXPECT_EQ(PrefStore::READ_NO_VALUE, store->GetValue(unknown_string, &actual));
 }
 
 // Tests a complex command line with multiple known and unknown switches.
 TEST(CommandLinePrefStoreTest, MultipleSwitches) {
   CommandLine cl(CommandLine::NO_PROGRAM);
   cl.AppendSwitch(unknown_string);
-  cl.AppendSwitch(switches::kProxyAutoDetect);
   cl.AppendSwitchASCII(switches::kProxyServer, "proxy");
   cl.AppendSwitchASCII(switches::kProxyBypassList, "list");
   cl.AppendSwitchASCII(unknown_bool, "a value");
   scoped_refptr<TestCommandLinePrefStore> store =
       new TestCommandLinePrefStore(&cl);
 
   Value* actual = NULL;
   EXPECT_EQ(PrefStore::READ_NO_VALUE, store->GetValue(unknown_bool, &actual));
-  store->VerifyIntPref(prefs::kProxyMode, ProxyPrefs::MODE_AUTO_DETECT);
+  EXPECT_EQ(PrefStore::READ_NO_VALUE, store->GetValue(unknown_string, &actual));
 
-  EXPECT_EQ(PrefStore::READ_NO_VALUE, store->GetValue(unknown_string, &actual));
+  store->VerifyProxyMode(ProxyPrefs::MODE_FIXED_SERVERS);
+
+  Value* value = NULL;
+  ASSERT_EQ(PrefStore::READ_OK, store->GetValue(prefs::kProxy, &value));
+  ASSERT_EQ(Value::TYPE_DICTIONARY, value->GetType());
+  ProxyPrefsDictionary dict(static_cast<DictionaryValue*>(value));
+
   std::string string_result = "";
-  ASSERT_EQ(PrefStore::READ_OK, store->GetValue(prefs::kProxyServer, &actual));
-  EXPECT_TRUE(actual->GetAsString(&string_result));
+
+  ASSERT_TRUE(dict.GetProxyServer(&string_result));
   EXPECT_EQ("proxy", string_result);
-  ASSERT_EQ(PrefStore::READ_OK,
-            store->GetValue(prefs::kProxyBypassList, &actual));
-  EXPECT_TRUE(actual->GetAsString(&string_result));
+
+  ASSERT_TRUE(dict.GetBypassList(&string_result));
   EXPECT_EQ("list", string_result);
 }
 
 // Tests proxy switch validation.
 TEST(CommandLinePrefStoreTest, ProxySwitchValidation) {
   CommandLine cl(CommandLine::NO_PROGRAM);
 
   // No switches.
   scoped_refptr<TestCommandLinePrefStore> store =
       new TestCommandLinePrefStore(&cl);
@@ skipping 21 matching lines @@
       new TestCommandLinePrefStore(&cl2);
   EXPECT_TRUE(store4->ProxySwitchesAreValid());
 }
 
 TEST(CommandLinePrefStoreTest, ManualProxyModeInference) {
   CommandLine cl1(CommandLine::NO_PROGRAM);
   cl1.AppendSwitch(unknown_string);
   cl1.AppendSwitchASCII(switches::kProxyServer, "proxy");
   scoped_refptr<TestCommandLinePrefStore> store1 =
       new TestCommandLinePrefStore(&cl1);
-  store1->VerifyIntPref(prefs::kProxyMode, ProxyPrefs::MODE_FIXED_SERVERS);
+  store1->VerifyProxyMode(ProxyPrefs::MODE_FIXED_SERVERS);
 
   CommandLine cl2(CommandLine::NO_PROGRAM);
   cl2.AppendSwitchASCII(switches::kProxyPacUrl, "proxy");
   scoped_refptr<TestCommandLinePrefStore> store2 =
         new TestCommandLinePrefStore(&cl2);
-  store2->VerifyIntPref(prefs::kProxyMode, ProxyPrefs::MODE_PAC_SCRIPT);
+  store2->VerifyProxyMode(ProxyPrefs::MODE_PAC_SCRIPT);
 }