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

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

Download patch

« no previous file with comments | « chrome/browser/sync/glue/non_frontend_data_type_controller.cc ('k') | chrome/browser/sync/glue/preference_data_type_controller_unittest.cc » ('j') | chrome/browser/sync/glue/sync_backend_host.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/glue/non_frontend_data_type_controller_unittest.cc

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

index a791e6ee9a21d65b188a461689efbcec4743ee95..154a93c1f3141f75e91c434a36df22a5ff876c9b 100644

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

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

@@ -159,14 +159,14 @@ class NonFrontendDataTypeControllerTest : 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_, StopAssociationAsync());

EXPECT_CALL(*dtc_mock_, StopModels());

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

+ EXPECT_CALL(service_, DeactivateDataType(_));

EXPECT_CALL(*model_associator_, DisassociateModels(_));

}

@@ -312,7 +312,7 @@ TEST_F(NonFrontendDataTypeControllerTest, AbortDuringAssociationInactive) {

SignalEvent(&pause_db_thread));

EXPECT_CALL(*model_associator_, AssociateModels(_)).WillOnce(Return(true));

EXPECT_CALL(*dtc_mock_, RecordAssociationTime(_));

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

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

EXPECT_CALL(start_callback_, Run(DataTypeController::ABORTED,_));

EXPECT_CALL(*dtc_mock_, RecordStartFailure(DataTypeController::ABORTED));

SetStopExpectations();

@@ -342,7 +342,7 @@ TEST_F(NonFrontendDataTypeControllerTest, AbortDuringAssociationActivated) {

EXPECT_CALL(*model_associator_, AssociateModels(_)).

WillOnce(Return(true));

EXPECT_CALL(*dtc_mock_, RecordAssociationTime(_));

- EXPECT_CALL(service_, ActivateDataType(_, _)).WillOnce(DoAll(

+ EXPECT_CALL(service_, ActivateDataType(_, _, _)).WillOnce(DoAll(

SignalEvent(&wait_for_db_thread_pause),

WaitOnEvent(&pause_db_thread)));

EXPECT_CALL(start_callback_, Run(DataTypeController::ABORTED,_));