chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc - Issue 10696087: [Sync] Move ModelType and related classes to 'syncer' namespace

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 10696087: [Sync] Move ModelType and related classes to 'syncer' namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: sort headers, update copyrights Created 8 years, 6 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_extensions_sync_test.cc ('k') | chrome/browser/sync/test/integration/two_client_preferences_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 b37a6a444cdd74c5d5f775877c8d79bca53a86a2..31a58f2d19b88e788852e23924f2d3df2fcac4bc 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

@@ -73,7 +73,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest, DisablePasswords) {

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

ASSERT_TRUE(AllProfilesContainSamePasswordFormsAsVerifier());

- ASSERT_TRUE(GetClient(1)->DisableSyncForDatatype(syncable::PASSWORDS));

+ ASSERT_TRUE(GetClient(1)->DisableSyncForDatatype(syncer::PASSWORDS));

PasswordForm form = CreateTestPasswordForm(0);

AddLogin(GetVerifierPasswordStore(), form);

ASSERT_EQ(1, GetVerifierPasswordCount());

@@ -84,7 +84,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest, DisablePasswords) {

ASSERT_TRUE(ProfileContainsSamePasswordFormsAsVerifier(0));

ASSERT_FALSE(ProfileContainsSamePasswordFormsAsVerifier(1));

- ASSERT_TRUE(GetClient(1)->EnableSyncForDatatype(syncable::PASSWORDS));

+ ASSERT_TRUE(GetClient(1)->EnableSyncForDatatype(syncer::PASSWORDS));

ASSERT_TRUE(AwaitQuiescence());

ASSERT_TRUE(AllProfilesContainSamePasswordFormsAsVerifier());

ASSERT_EQ(1, GetPasswordCount(1));

@@ -254,10 +254,10 @@ IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest,

// Following ensures types are enabled and active (see bug 87572).

syncer::ModelSafeRoutingInfo routes;

GetClient(0)->service()->GetModelSafeRoutingInfo(&routes);

- ASSERT_EQ(syncer::GROUP_PASSWORD, routes[syncable::PASSWORDS]);

+ ASSERT_EQ(syncer::GROUP_PASSWORD, routes[syncer::PASSWORDS]);

routes.clear();

GetClient(1)->service()->GetModelSafeRoutingInfo(&routes);

- ASSERT_EQ(syncer::GROUP_PASSWORD, routes[syncable::PASSWORDS]);

+ ASSERT_EQ(syncer::GROUP_PASSWORD, routes[syncer::PASSWORDS]);

}

IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest,