chrome/test/live_sync/live_sync_test.cc - Issue 7259005: Allow sync integration tests to operate on multiple datatypes: Preferences + Bookmarks

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/live_sync_test.cc

Issue 7259005: Allow sync integration tests to operate on multiple datatypes: Preferences + Bookmarks (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Actual patch set. (Moves show up as adds / deletes. Hard to review) Created 9 years, 5 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/test/live_sync/live_sync_test.h ('K') | « chrome/test/live_sync/live_sync_test.h ('k') | chrome/test/live_sync/many_client_live_preferences_sync_test.cc » ('j') | chrome/test/live_sync/preferences_helper.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/test/live_sync/live_sync_test.cc

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

index 3eeb6a0058da99a30f947c9c966d851612dbcd57..f03c6c7afb98546a1f3e3822d2dae6c16102f8b5 100644

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

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

@@ -109,7 +109,8 @@ LiveSyncTest::LiveSyncTest(TestType test_type)

test_type_(test_type),

server_type_(SERVER_TYPE_UNDECIDED),

num_clients_(-1),

- test_server_handle_(base::kNullProcessHandle) {

+ test_server_handle_(base::kNullProcessHandle),

+ use_verifier_prefs_(true) {

InProcessBrowserTest::set_show_window(true);

switch (test_type_) {

case SINGLE_CLIENT: {

@@ -247,6 +248,10 @@ Profile* LiveSyncTest::verifier() {

return verifier_.get();

}

+void LiveSyncTest::DisableVerifier() {

+ use_verifier_prefs_ = false;

bool LiveSyncTest::SetupClients() {

if (num_clients_ <= 0)

LOG(FATAL) << "num_clients_ incorrectly initialized.";