summaryrefslogtreecommitdiffstats
path: root/chrome/test/live_sync
diff options
context:
space:
mode:
authoralbertb@chromium.org <albertb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-29 20:34:03 +0000
committeralbertb@chromium.org <albertb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-29 20:34:03 +0000
commit50e0a1c56b14c3083b4a6f143bc56a5601a732b3 (patch)
treec4302793280b2c61e67c9c9995115110f9179e4e /chrome/test/live_sync
parent9fbc0f7ed6eec04c0ce218052269992f4779f63d (diff)
downloadchromium_src-50e0a1c56b14c3083b4a6f143bc56a5601a732b3.zip
chromium_src-50e0a1c56b14c3083b4a6f143bc56a5601a732b3.tar.gz
chromium_src-50e0a1c56b14c3083b4a6f143bc56a5601a732b3.tar.bz2
In the sync integration tests for preferences, don't assume a specific
initial value for kHomePageIsNewTabPage. BUG=42669 TEST=TwoClientLivePreferencesSyncTest.Sanity Review URL: http://codereview.chromium.org/1801006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45979 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/live_sync')
-rw-r--r--chrome/test/live_sync/two_client_live_preferences_sync_test.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/test/live_sync/two_client_live_preferences_sync_test.cc b/chrome/test/live_sync/two_client_live_preferences_sync_test.cc
index 04b4ee4..8348896 100644
--- a/chrome/test/live_sync/two_client_live_preferences_sync_test.cc
+++ b/chrome/test/live_sync/two_client_live_preferences_sync_test.cc
@@ -55,14 +55,15 @@ class TwoClientLivePreferencesSyncTest : public LiveSyncTest {
IN_PROC_BROWSER_TEST_F(TwoClientLivePreferencesSyncTest, Sanity) {
SetupSync();
- EXPECT_EQ(false, prefs1()->GetBoolean(prefs::kHomePageIsNewTabPage));
- EXPECT_EQ(false, prefs2()->GetBoolean(prefs::kHomePageIsNewTabPage));
+ EXPECT_EQ(prefs1()->GetBoolean(prefs::kHomePageIsNewTabPage),
+ prefs2()->GetBoolean(prefs::kHomePageIsNewTabPage));
PrefService* expected = LiveSyncTest::MakeProfile(
FILE_PATH_LITERAL("verifier"))->GetPrefs();
- expected->SetBoolean(prefs::kHomePageIsNewTabPage, true);
+ bool value = !expected->GetBoolean(prefs::kHomePageIsNewTabPage);
+ expected->SetBoolean(prefs::kHomePageIsNewTabPage, value);
- prefs1()->SetBoolean(prefs::kHomePageIsNewTabPage, true);
+ prefs1()->SetBoolean(prefs::kHomePageIsNewTabPage, value);
EXPECT_TRUE(client2()->AwaitMutualSyncCycleCompletion(client1()));
EXPECT_EQ(expected->GetBoolean(prefs::kHomePageIsNewTabPage),