chrome/browser/sync/abstract_profile_sync_service_test.cc - Issue 10911073: NOT FOR COMMIT: Add DeviceInfo type and ChangeProcessor

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 10911073: NOT FOR COMMIT: Add DeviceInfo type and ChangeProcessor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: More fixes Created 8 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:

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 f12c501ef151a72a6690c06b2c947d98b34c75ad..2442c880bf7815051985f942f12e74b485467aa4 100644

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

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

@@ -42,8 +42,7 @@ const std::string ProfileSyncServiceTestHelper::GetTagForType(

/* static */

bool ProfileSyncServiceTestHelper::CreateRoot(ModelType model_type,

- UserShare* user_share,

- TestIdFactory* ids) {

+ UserShare* user_share) {

syncer::syncable::Directory* directory = user_share->directory.get();

std::string tag_name = GetTagForType(model_type);

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

node.Put(SERVER_VERSION, 20);

node.Put(BASE_VERSION, 20);

node.Put(IS_DEL, false);

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

+ node.Put(syncer::syncable::ID, TestIdFactory::MakeServer(tag_name));

sync_pb::EntitySpecifics specifics;

syncer::AddDefaultFieldValue(model_type, &specifics);

node.Put(SPECIFICS, specifics);

@@ -120,8 +119,7 @@ void AbstractProfileSyncServiceTest::TearDown() {

bool AbstractProfileSyncServiceTest::CreateRoot(ModelType model_type) {

return ProfileSyncServiceTestHelper::CreateRoot(

model_type,

- service_->GetUserShare(),

- service_->id_factory());

+ service_->GetUserShare());

}

// static