chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc - Issue 2354613002: [Sync] Fix namespaces for the browser_sync component.

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

Issue 2354613002: [Sync] Fix namespaces for the browser_sync component. (Closed)

Patch Set: Address comments. Created 4 years, 3 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/two_client_bookmarks_sync_test.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_passwords_sync_test.cc

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

index a2c1b911988447be7a2e4ed8f770c9dcef5ab46c..aebe553e77e77d422ccb70e1f48e46c2bcdf8b1b 100644

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

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

@@ -83,7 +83,8 @@ IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest,

E2E_ENABLED(SetPassphraseAndAddPassword)) {

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

- SetEncryptionPassphrase(0, kValidPassphrase, ProfileSyncService::EXPLICIT);

+ SetEncryptionPassphrase(0, kValidPassphrase,

+ browser_sync::ProfileSyncService::EXPLICIT);

ASSERT_TRUE(AwaitPassphraseAccepted(GetSyncService((0))));

ASSERT_TRUE(AwaitPassphraseRequired(GetSyncService((1))));

@@ -148,7 +149,8 @@ IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest,

ASSERT_TRUE(SetupClients());

ASSERT_TRUE(GetClient(0)->SetupSync());

- SetEncryptionPassphrase(0, kValidPassphrase, ProfileSyncService::EXPLICIT);

+ SetEncryptionPassphrase(0, kValidPassphrase,

+ browser_sync::ProfileSyncService::EXPLICIT);

ASSERT_TRUE(AwaitPassphraseAccepted(GetSyncService(0)));

// When client 1 hits a passphrase required state, we can infer that