chrome/browser/sync/profile_sync_service_unittest.cc - Issue 534733002: Revert "[Sync] Move DataTypeStatusTable ownership into DataTypeManager."

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

Issue 534733002: Revert "[Sync] Move DataTypeStatusTable ownership into DataTypeManager." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/sync/profile_sync_service_typed_url_unittest.cc ('k') | chrome/browser/sync/test/integration/sync_errors_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/profile_sync_service_unittest.cc

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

index accbcb4c5317b70bc97622746a1613e14663f4ed..809335861ff82752b85d3486807160d59992f2f7 100644

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

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

@@ -58,7 +58,6 @@ class FakeDataTypeManager : public sync_driver::DataTypeManager {

}

virtual void ReenableType(syncer::ModelType type) OVERRIDE {}

- virtual void ResetDataTypeErrors() OVERRIDE {}

virtual void PurgeForMigration(syncer::ModelTypeSet undesired_types,

syncer::ConfigureReason reason) OVERRIDE {}

virtual void Stop() OVERRIDE {};

@@ -252,7 +251,7 @@ class ProfileSyncServiceTest : public ::testing::Test {

}

void ExpectDataTypeManagerCreation(int times) {

- EXPECT_CALL(*components_factory_, CreateDataTypeManager(_, _, _, _, _))

+ EXPECT_CALL(*components_factory_, CreateDataTypeManager(_, _, _, _, _, _))

.Times(times)

.WillRepeatedly(ReturnNewDataTypeManager());

}