chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc - Issue 8334030: Merge search engines sync data type with Preferences. Sync the default search provider. Add some ...

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/browser/sync/test/integration/two_client_sessions_sync_test.cc

Issue 8334030: Merge search engines sync data type with Preferences. Sync the default search provider. Add some ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 9 years, 1 month 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/sync/test/integration/sync_test.h ('K') | « chrome/browser/sync/test/integration/two_client_search_engines_sync_test.cc ('k') | chrome/browser/ui/webui/ntp/ntp_resource_cache.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc

===================================================================

--- chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc (revision 108905)

+++ chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc (working copy)

@@ -160,10 +160,9 @@

ASSERT_TRUE(GetClient(1)->AwaitPassphraseRequired());

ASSERT_EQ(0, GetClient(1)->GetLastSessionSnapshot()->

num_blocking_conflicting_updates);

- // We have 6 non-blocking conflicts due to the two meta nodes (one for each

- // client), the one tab node, and the six basic preference/themes/search

- // engines.

- ASSERT_EQ(9, GetClient(1)->GetLastSessionSnapshot()->

+ // We have two meta nodes (one for each client), the one tab node, plus the

+ // basic preference/themes/search engines items.

+ ASSERT_EQ(NumberOfDefaultItems() + 3, GetClient(1)->GetLastSessionSnapshot()->

num_conflicting_updates); // The encrypted nodes.

GetClient(1)->service()->SetPassphrase(kValidPassphrase, true);

@@ -242,8 +241,8 @@

ASSERT_EQ(0, GetClient(1)->GetLastSessionSnapshot()->

num_blocking_conflicting_updates);

// We have two non-blocking conflicts due to the two meta nodes (one for each

- // client), and the 6 basic preference/themes/search engines nodes.

- ASSERT_EQ(8, GetClient(1)->GetLastSessionSnapshot()->

+ // client), plus the basic preference/themes/search engines nodes.

+ ASSERT_EQ(NumberOfDefaultItems() + 2, GetClient(1)->GetLastSessionSnapshot()->

num_conflicting_updates); // The encrypted nodes.

// These changes are either made with the old passphrase or not encrypted at

@@ -339,9 +338,9 @@

ASSERT_EQ(0, GetClient(1)->GetLastSessionSnapshot()->

num_blocking_conflicting_updates);

// We have three non-blocking conflicts due to the two meta nodes (one for

- // each client), the one tab node, and the 6 basic preference/themes/search

+ // each client), the one tab node, plus the basic preference/themes/search

// engines nodes.

- ASSERT_EQ(9, GetClient(1)->GetLastSessionSnapshot()->

+ ASSERT_EQ(NumberOfDefaultItems() + 3, GetClient(1)->GetLastSessionSnapshot()->

num_conflicting_updates); // The encrypted nodes.

GetClient(1)->service()->SetPassphrase(kValidPassphrase, true);