chrome/browser/sync/test/integration/enable_disable_test.cc - Issue 10698014: [Sync] Rename csync namespace to syncer

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/enable_disable_test.cc

Issue 10698014: [Sync] Rename csync namespace to syncer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address comments 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/sync_ui_util_unittest.cc ('k') | chrome/browser/sync/test/integration/performance/typed_urls_sync_perf_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 4ec36723647643e633f7b15b1b8f5179b3e4ff5d..e712272402e55fc95708a69ed1551c6106963458 100644

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

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

@@ -30,12 +30,12 @@ class EnableDisableSingleClientTest : public EnableDisableTest {

DISALLOW_COPY_AND_ASSIGN(EnableDisableSingleClientTest);

};

-bool DoesTopLevelNodeExist(csync::UserShare* user_share,

+bool DoesTopLevelNodeExist(syncer::UserShare* user_share,

syncable::ModelType type) {

- csync::ReadTransaction trans(FROM_HERE, user_share);

- csync::ReadNode node(&trans);

+ syncer::ReadTransaction trans(FROM_HERE, user_share);

+ syncer::ReadNode node(&trans);

return node.InitByTagLookup(syncable::ModelTypeToRootTag(type)) ==

- csync::BaseNode::INIT_OK;

+ syncer::BaseNode::INIT_OK;

}

IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, EnableOneAtATime) {

@@ -51,7 +51,7 @@ IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, EnableOneAtATime) {

const syncable::ModelTypeSet registered_types =

GetClient(0)->service()->GetRegisteredDataTypes();

- csync::UserShare* user_share = GetClient(0)->service()->GetUserShare();

+ syncer::UserShare* user_share = GetClient(0)->service()->GetUserShare();

for (syncable::ModelTypeSet::Iterator it = registered_types.First();

it.Good(); it.Inc()) {

ASSERT_TRUE(GetClient(0)->EnableSyncForDatatype(it.Get()));

@@ -88,7 +88,7 @@ IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, DisableOneAtATime) {

const syncable::ModelTypeSet registered_types =

GetClient(0)->service()->GetRegisteredDataTypes();

- csync::UserShare* user_share = GetClient(0)->service()->GetUserShare();

+ syncer::UserShare* user_share = GetClient(0)->service()->GetUserShare();

// Make sure all top-level nodes exist first.

for (syncable::ModelTypeSet::Iterator it = registered_types.First();

@@ -105,7 +105,7 @@ IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, DisableOneAtATime) {

continue;

}

- csync::UserShare* user_share =

+ syncer::UserShare* user_share =

GetClient(0)->service()->GetUserShare();

ASSERT_FALSE(DoesTopLevelNodeExist(user_share, it.Get()))