chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc - Issue 2388163002: [Sync] Move //components/sync to the syncer namespace, take 2.

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_bookmarks_sync_test.cc

Issue 2388163002: [Sync] Move //components/sync to the syncer namespace, take 2. (Closed)

Patch Set: Rebase. Created 4 years, 2 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/browser/sync/test/integration/quiesce_status_change_checker.cc ('k') | chrome/browser/sync/test/integration/two_client_uss_sync_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

diff --git a/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc b/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc

index de93be151b2c2c7b048655d3f9e7b5fa9a500478..450e06fb668d25d3fe9cd5f425d92e95fc36976d 100644

--- a/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc

+++ b/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc

@@ -1999,8 +1999,8 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,

// Set a passphrase and enable encryption on Client 0. Client 1 will not

// understand the bookmark updates.

- GetSyncService(0)->SetEncryptionPassphrase(

- kValidPassphrase, sync_driver::SyncService::EXPLICIT);

+ GetSyncService(0)->SetEncryptionPassphrase(kValidPassphrase,

+ syncer::SyncService::EXPLICIT);

ASSERT_TRUE(PassphraseAcceptedChecker(GetSyncService(0)).Wait());

ASSERT_TRUE(EnableEncryption(0));

ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));