chrome/browser/sync/abstract_profile_sync_service_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/abstract_profile_sync_service_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:

Index: chrome/browser/sync/abstract_profile_sync_service_test.cc

diff --git a/chrome/browser/sync/abstract_profile_sync_service_test.cc b/chrome/browser/sync/abstract_profile_sync_service_test.cc

index 82b6d5d8bd79be6692a559a3216269c110e674d2..f12c501ef151a72a6690c06b2c947d98b34c75ad 100644

--- a/chrome/browser/sync/abstract_profile_sync_service_test.cc

+++ b/chrome/browser/sync/abstract_profile_sync_service_test.cc

@@ -18,6 +18,7 @@

using syncer::TestIdFactory;

using content::BrowserThread;

+using syncer::ModelType;

using syncer::UserShare;

using syncer::syncable::BASE_VERSION;

using syncer::syncable::CREATE;

@@ -25,7 +26,6 @@ using syncer::syncable::IS_DEL;

using syncer::syncable::IS_DIR;

using syncer::syncable::IS_UNAPPLIED_UPDATE;

using syncer::syncable::IS_UNSYNCED;

-using syncer::syncable::ModelType;

using syncer::syncable::MutableEntry;

using syncer::syncable::SERVER_IS_DIR;

using syncer::syncable::SERVER_VERSION;

@@ -37,7 +37,7 @@ using syncer::syncable::WriteTransaction;

/* static */

const std::string ProfileSyncServiceTestHelper::GetTagForType(

ModelType model_type) {

- return syncable::ModelTypeToRootTag(model_type);

+ return syncer::ModelTypeToRootTag(model_type);

}

/* static */

@@ -63,7 +63,7 @@ bool ProfileSyncServiceTestHelper::CreateRoot(ModelType model_type,

node.Put(IS_DEL, false);

node.Put(syncer::syncable::ID, ids->MakeServer(tag_name));

sync_pb::EntitySpecifics specifics;

- syncable::AddDefaultFieldValue(model_type, &specifics);

+ syncer::AddDefaultFieldValue(model_type, &specifics);

node.Put(SPECIFICS, specifics);

return true;