chrome/browser/sync/test/integration/two_client_typed_urls_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_typed_urls_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_themes_sync_test.cc ('k') | chrome/browser/sync/test_profile_sync_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 5d270e1828e8fc0810f9136910ad581f7d89417d..063e0646bb7b61282d7c09438c89a01ba67bc107 100644

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

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

@@ -193,7 +193,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientTypedUrlsSyncTest, DisableEnableSync) {

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

// Disable typed url sync for one client, leave it active for the other.

- GetClient(0)->DisableSyncForDatatype(syncable::TYPED_URLS);

+ GetClient(0)->DisableSyncForDatatype(syncer::TYPED_URLS);

// Add one URL to non-syncing client, add a different URL to the other,

// wait for sync cycle to complete. No data should be exchanged.

@@ -212,7 +212,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientTypedUrlsSyncTest, DisableEnableSync) {

ASSERT_EQ(url2, post_sync_urls[0].url());

// Enable typed url sync, make both URLs are synced to each client.

- GetClient(0)->EnableSyncForDatatype(syncable::TYPED_URLS);

+ GetClient(0)->EnableSyncForDatatype(syncer::TYPED_URLS);

ASSERT_TRUE(AwaitQuiescence());

AssertAllProfilesHaveSameURLsAsVerifier();