chrome/browser/sync/glue/frontend_data_type_controller_unittest.cc - Issue 7511004: [Sync] Refactor data type configuration/activation/deactivation

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/glue/frontend_data_type_controller_unittest.cc

Issue 7511004: [Sync] Refactor data type configuration/activation/deactivation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix tests, address comments Created 9 years, 4 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/glue/frontend_data_type_controller_unittest.cc

diff --git a/chrome/browser/sync/glue/frontend_data_type_controller_unittest.cc b/chrome/browser/sync/glue/frontend_data_type_controller_unittest.cc

index 5a8a1cf8100be2e66d4bb3f0791c99920c31acb1..c0374bc38c34cdaf8b8045de5e45c8f98af26e6f 100644

--- a/chrome/browser/sync/glue/frontend_data_type_controller_unittest.cc

+++ b/chrome/browser/sync/glue/frontend_data_type_controller_unittest.cc

@@ -118,13 +118,13 @@ class FrontendDataTypeControllerTest : public TestingBrowserProcessTest {

}

void SetActivateExpectations(DataTypeController::StartResult result) {

- EXPECT_CALL(service_, ActivateDataType(_, _));

+ EXPECT_CALL(service_, ActivateDataType(_, _, _));

EXPECT_CALL(start_callback_, Run(result,_));

}

void SetStopExpectations() {

EXPECT_CALL(*dtc_mock_, CleanUpState());

- EXPECT_CALL(service_, DeactivateDataType(_, _));

+ EXPECT_CALL(service_, DeactivateDataType(_));

EXPECT_CALL(*model_associator_, DisassociateModels(_));

}