chrome/test/live_sync/single_client_preferences_sync_test.cc - Issue 7461109: Allow sync integration tests to operate on multiple datatypes: Typed Urls

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/test/live_sync/single_client_preferences_sync_test.cc

Issue 7461109: Allow sync integration tests to operate on multiple datatypes: Typed Urls (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: CR feedback; rebase Created 9 years, 4 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

« no previous file with comments | « chrome/test/live_sync/single_client_live_typed_urls_sync_test.cc ('k') | chrome/test/live_sync/single_client_typed_urls_sync_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/test/live_sync/single_client_preferences_sync_test.cc

diff --git a/chrome/test/live_sync/single_client_preferences_sync_test.cc b/chrome/test/live_sync/single_client_preferences_sync_test.cc

index 25db722630d9e14e035717c1e6c88fea2e1133b9..1618ddaebefa536f8497dee1dac2ce39383b673a 100644

--- a/chrome/test/live_sync/single_client_preferences_sync_test.cc

+++ b/chrome/test/live_sync/single_client_preferences_sync_test.cc

@@ -7,6 +7,9 @@

#include "chrome/test/live_sync/preferences_helper.h"

#include "chrome/test/live_sync/live_sync_test.h"

+using preferences_helper::BooleanPrefMatches;

+using preferences_helper::ChangeBooleanPref;

class SingleClientPreferencesSyncTest : public LiveSyncTest {

public:

SingleClientPreferencesSyncTest() : LiveSyncTest(SINGLE_CLIENT) {}

@@ -18,11 +21,9 @@ class SingleClientPreferencesSyncTest : public LiveSyncTest {

IN_PROC_BROWSER_TEST_F(SingleClientPreferencesSyncTest, Sanity) {

ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";

- ASSERT_TRUE(PreferencesHelper::BooleanPrefMatches(

- prefs::kHomePageIsNewTabPage));

- PreferencesHelper::ChangeBooleanPref(0, prefs::kHomePageIsNewTabPage);

+ ASSERT_TRUE(BooleanPrefMatches(prefs::kHomePageIsNewTabPage));

+ ChangeBooleanPref(0, prefs::kHomePageIsNewTabPage);

ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion(

"Waiting for prefs change."));

- ASSERT_TRUE(PreferencesHelper::BooleanPrefMatches(

- prefs::kHomePageIsNewTabPage));

+ ASSERT_TRUE(BooleanPrefMatches(prefs::kHomePageIsNewTabPage));

}