Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(905)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/prefs/pref_service_unittest.cc

Issue 6240013: Make proxy settings one atomic dictionary in the PrefStores such that modifications are atomic. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/out/Debug
Patch Set: Updated to ToT and addressed Matt's comments in base-CL Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/policy/configuration_policy_pref_store_unittest.cc ('K') | « chrome/browser/prefs/pref_service.cc ('k') | chrome/browser/prefs/pref_set_observer.cc » ('j') | chrome/browser/prefs/proxy_prefs.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prefs/pref_service_unittest.cc
diff --git a/chrome/browser/prefs/pref_service_unittest.cc b/chrome/browser/prefs/pref_service_unittest.cc
index 32ab5b7b2357e297af4118f9f08ffa2cbbc22255..649509eb8022162c398a29e4931c05708f1a5ab6 100644
--- a/chrome/browser/prefs/pref_service_unittest.cc
+++ b/chrome/browser/prefs/pref_service_unittest.cc
@@ -169,6 +169,54 @@ TEST(PrefServiceTest, GetValueChangedType) {
EXPECT_EQ(kTestValue, actual_int_value);
}
+void assertProxyMode(const ProxyPrefsDictionary& dict,
+ ProxyPrefs::ProxyMode expected_mode) {
+ ProxyPrefs::ProxyMode actual_mode;
+ ASSERT_TRUE(dict.GetMode(&actual_mode));
+ EXPECT_EQ(expected_mode, actual_mode);
+}
+
+void assertProxyServer(const ProxyPrefsDictionary& dict,
+ const std::string& expected) {
+ std::string actual;
+ if (!expected.empty()) {
+ ASSERT_TRUE(dict.GetProxyServer(&actual));
+ EXPECT_EQ(expected, actual);
+ } else {
+ EXPECT_FALSE(dict.GetProxyServer(&actual));
+ }
+}
+
+void assertPacUrl(const ProxyPrefsDictionary& dict,
+ const std::string& expected) {
+ std::string actual;
+ if (!expected.empty()) {
+ ASSERT_TRUE(dict.GetPacUrl(&actual));
+ EXPECT_EQ(expected, actual);
+ } else {
+ EXPECT_FALSE(dict.GetPacUrl(&actual));
+ }
+}
+
+void assertBypassList(const ProxyPrefsDictionary& dict,
+ const std::string& expected) {
+ std::string actual;
+ if (!expected.empty()) {
+ ASSERT_TRUE(dict.GetBypassList(&actual));
+ EXPECT_EQ(expected, actual);
+ } else {
+ EXPECT_FALSE(dict.GetBypassList(&actual));
+ }
+}
+
+void assertProxyModeWithoutParams(const ProxyPrefsDictionary& dict,
+ ProxyPrefs::ProxyMode proxy_mode) {
+ assertProxyMode(dict, proxy_mode);
+ assertProxyServer(dict, "");
+ assertPacUrl(dict, "");
+ assertBypassList(dict, "");
+}
+
TEST(PrefServiceTest, ProxyPolicyOverridesCommandLineOptions) {
CommandLine command_line(CommandLine::NO_PROGRAM);
command_line.AppendSwitchASCII(switches::kProxyBypassList, "123");
@@ -189,11 +237,11 @@ TEST(PrefServiceTest, ProxyPolicyOverridesCommandLineOptions) {
builder.WithCommandLine(&command_line);
scoped_ptr<PrefService> prefs(builder.Create());
browser::RegisterUserPrefs(prefs.get());
- EXPECT_EQ(ProxyPrefs::MODE_FIXED_SERVERS,
- prefs->GetInteger(prefs::kProxyMode));
- EXPECT_EQ("789", prefs->GetString(prefs::kProxyServer));
- EXPECT_EQ(std::string(), prefs->GetString(prefs::kProxyPacUrl));
- EXPECT_EQ("123", prefs->GetString(prefs::kProxyBypassList));
+ ProxyPrefsDictionary dict(prefs->GetDictionary(prefs::kProxy));
+ assertProxyMode(dict, ProxyPrefs::MODE_FIXED_SERVERS);
+ assertProxyServer(dict, "789");
+ assertPacUrl(dict, "");
+ assertBypassList(dict, "123");
// Try a second time time with the managed PrefStore in place, the
// manual proxy policy should have removed all traces of the command
@@ -202,11 +250,11 @@ TEST(PrefServiceTest, ProxyPolicyOverridesCommandLineOptions) {
builder.WithManagedPlatformProvider(provider.get());
scoped_ptr<PrefService> prefs2(builder.Create());
browser::RegisterUserPrefs(prefs2.get());
- EXPECT_EQ(ProxyPrefs::MODE_FIXED_SERVERS,
- prefs2->GetInteger(prefs::kProxyMode));
- EXPECT_EQ("ghi", prefs2->GetString(prefs::kProxyServer));
- EXPECT_EQ(std::string(), prefs2->GetString(prefs::kProxyPacUrl));
- EXPECT_EQ("abc", prefs2->GetString(prefs::kProxyBypassList));
+ ProxyPrefsDictionary dict2(prefs2->GetDictionary(prefs::kProxy));
+ assertProxyMode(dict2, ProxyPrefs::MODE_FIXED_SERVERS);
+ assertProxyServer(dict2, "ghi");
+ assertPacUrl(dict2, "");
+ assertBypassList(dict2, "abc");
}
TEST(PrefServiceTest, ProxyPolicyOverridesUnrelatedCommandLineOptions) {
@@ -225,10 +273,11 @@ TEST(PrefServiceTest, ProxyPolicyOverridesUnrelatedCommandLineOptions) {
builder.WithCommandLine(&command_line);
scoped_ptr<PrefService> prefs(builder.Create());
browser::RegisterUserPrefs(prefs.get());
- EXPECT_EQ(ProxyPrefs::MODE_FIXED_SERVERS,
- prefs->GetInteger(prefs::kProxyMode));
- EXPECT_EQ("789", prefs->GetString(prefs::kProxyServer));
- EXPECT_EQ("123", prefs->GetString(prefs::kProxyBypassList));
+ ProxyPrefsDictionary dict(prefs->GetDictionary(prefs::kProxy));
+ assertProxyMode(dict, ProxyPrefs::MODE_FIXED_SERVERS);
+ assertProxyServer(dict, "789");
+ assertPacUrl(dict, "");
+ assertBypassList(dict, "123");
// Try a second time time with the managed PrefStore in place, the
// no proxy policy should have removed all traces of the command
@@ -238,11 +287,8 @@ TEST(PrefServiceTest, ProxyPolicyOverridesUnrelatedCommandLineOptions) {
builder.WithManagedPlatformProvider(provider.get());
scoped_ptr<PrefService> prefs2(builder.Create());
browser::RegisterUserPrefs(prefs2.get());
- EXPECT_EQ(ProxyPrefs::MODE_AUTO_DETECT,
- prefs2->GetInteger(prefs::kProxyMode));
- EXPECT_EQ(std::string(), prefs2->GetString(prefs::kProxyServer));
- EXPECT_EQ(std::string(), prefs2->GetString(prefs::kProxyPacUrl));
- EXPECT_EQ(std::string(), prefs2->GetString(prefs::kProxyBypassList));
+ ProxyPrefsDictionary dict2(prefs2->GetDictionary(prefs::kProxy));
+ assertProxyModeWithoutParams(dict2, ProxyPrefs::MODE_AUTO_DETECT);
}
TEST(PrefServiceTest, ProxyPolicyOverridesCommandLineNoProxy) {
@@ -260,10 +306,8 @@ TEST(PrefServiceTest, ProxyPolicyOverridesCommandLineNoProxy) {
builder.WithCommandLine(&command_line);
scoped_ptr<PrefService> prefs(builder.Create());
browser::RegisterUserPrefs(prefs.get());
- EXPECT_EQ(ProxyPrefs::MODE_DIRECT, prefs->GetInteger(prefs::kProxyMode));
- EXPECT_EQ(std::string(), prefs->GetString(prefs::kProxyServer));
- EXPECT_EQ(std::string(), prefs->GetString(prefs::kProxyPacUrl));
- EXPECT_EQ(std::string(), prefs->GetString(prefs::kProxyBypassList));
+ ProxyPrefsDictionary dict(prefs->GetDictionary(prefs::kProxy));
+ assertProxyModeWithoutParams(dict, ProxyPrefs::MODE_DIRECT);
// Try a second time time with the managed PrefStore in place, the
// auto-detect should be overridden. The default pref store must be
@@ -272,11 +316,8 @@ TEST(PrefServiceTest, ProxyPolicyOverridesCommandLineNoProxy) {
builder.WithManagedPlatformProvider(provider.get());
scoped_ptr<PrefService> prefs2(builder.Create());
browser::RegisterUserPrefs(prefs2.get());
- EXPECT_EQ(ProxyPrefs::MODE_AUTO_DETECT,
- prefs2->GetInteger(prefs::kProxyMode));
- EXPECT_EQ(std::string(), prefs2->GetString(prefs::kProxyServer));
- EXPECT_EQ(std::string(), prefs2->GetString(prefs::kProxyPacUrl));
- EXPECT_EQ(std::string(), prefs2->GetString(prefs::kProxyBypassList));
+ ProxyPrefsDictionary dict2(prefs2->GetDictionary(prefs::kProxy));
+ assertProxyModeWithoutParams(dict2, ProxyPrefs::MODE_AUTO_DETECT);
}
TEST(PrefServiceTest, ProxyPolicyOverridesCommandLineAutoDetect) {
@@ -294,10 +335,8 @@ TEST(PrefServiceTest, ProxyPolicyOverridesCommandLineAutoDetect) {
builder.WithCommandLine(&command_line);
scoped_ptr<PrefService> prefs(builder.Create());
browser::RegisterUserPrefs(prefs.get());
- EXPECT_EQ(ProxyPrefs::MODE_AUTO_DETECT, prefs->GetInteger(prefs::kProxyMode));
- EXPECT_EQ(std::string(), prefs->GetString(prefs::kProxyServer));
- EXPECT_EQ(std::string(), prefs->GetString(prefs::kProxyPacUrl));
- EXPECT_EQ(std::string(), prefs->GetString(prefs::kProxyBypassList));
+ ProxyPrefsDictionary dict(prefs->GetDictionary(prefs::kProxy));
+ assertProxyModeWithoutParams(dict, ProxyPrefs::MODE_AUTO_DETECT);
// Try a second time time with the managed PrefStore in place, the
// auto-detect should be overridden. The default pref store must be
@@ -306,10 +345,8 @@ TEST(PrefServiceTest, ProxyPolicyOverridesCommandLineAutoDetect) {
builder.WithManagedPlatformProvider(provider.get());
scoped_ptr<PrefService> prefs2(builder.Create());
browser::RegisterUserPrefs(prefs2.get());
- EXPECT_EQ(ProxyPrefs::MODE_DIRECT, prefs2->GetInteger(prefs::kProxyMode));
- EXPECT_EQ(std::string(), prefs2->GetString(prefs::kProxyServer));
- EXPECT_EQ(std::string(), prefs2->GetString(prefs::kProxyPacUrl));
- EXPECT_EQ(std::string(), prefs2->GetString(prefs::kProxyBypassList));
+ ProxyPrefsDictionary dict2(prefs2->GetDictionary(prefs::kProxy));
+ assertProxyModeWithoutParams(dict2, ProxyPrefs::MODE_DIRECT);
}
class PrefServiceSetValueTest : public testing::Test {
« chrome/browser/policy/configuration_policy_pref_store_unittest.cc ('K') | « chrome/browser/prefs/pref_service.cc ('k') | chrome/browser/prefs/pref_set_observer.cc » ('j') | chrome/browser/prefs/proxy_prefs.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698