components/sync/driver/model_type_controller.cc - Issue 2471943002: [Sync] Make ModelTypeController::DeactivateDataType idempotent

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: components/sync/driver/model_type_controller.cc

Issue 2471943002: [Sync] Make ModelTypeController::DeactivateDataType idempotent (Closed)

Patch Set: Created 4 years, 1 month 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: components/sync/driver/model_type_controller.cc

diff --git a/components/sync/driver/model_type_controller.cc b/components/sync/driver/model_type_controller.cc

index 43d4e1459a43d87b56f3d57fa37eb751ea60d93f..313c8c4d5b3ba5a97f6ce1fca7230ed79ba061df 100644

--- a/components/sync/driver/model_type_controller.cc

+++ b/components/sync/driver/model_type_controller.cc

@@ -168,9 +168,10 @@ void ModelTypeController::DeactivateDataType(

BackendDataTypeConfigurer* configurer) {

DCHECK(CalledOnValidThread());

DCHECK(configurer);

- DCHECK(activated_);

- configurer->DeactivateNonBlockingDataType(type());

- activated_ = false;

+ if (activated_) {

+ configurer->DeactivateNonBlockingDataType(type());

+ activated_ = false;

+ }

}

void ModelTypeController::Stop() {

« no previous file with comments | « no previous file | components/sync/driver/model_type_controller_unittest.cc » ('j') | no next file with comments »