chrome/browser/sync/glue/sync_backend_host_impl.cc - Issue 1146533005: [Sync] InvalidationService shouldn't CHECK when registering ObjectId for more than one handler

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

Issue 1146533005: [Sync] InvalidationService shouldn't CHECK when registering ObjectId for more than one handler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressed comments from Bartosz. Created 5 years, 7 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/policy/cloud/remote_commands_invalidator.cc ('k') | chrome/browser/sync/test/integration/fake_server_invalidation_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index b84389c8fe64faa338bb32179f684e8ae36f4231..185b3f45acf3b2c43cf8fb7d2c43f5df5b0a4d0d 100644

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

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

@@ -318,9 +318,8 @@ scoped_ptr<base::Thread> SyncBackendHostImpl::Shutdown(

void SyncBackendHostImpl::UnregisterInvalidationIds() {

if (invalidation_handler_registered_) {

- invalidator_->UpdateRegisteredInvalidationIds(

- this,

- syncer::ObjectIdSet());

+ CHECK(invalidator_->UpdateRegisteredInvalidationIds(this,

+ syncer::ObjectIdSet()));

}

@@ -624,9 +623,8 @@ void SyncBackendHostImpl::FinishConfigureDataTypesOnFrontendLoop(

return;

if (invalidator_) {

- invalidator_->UpdateRegisteredInvalidationIds(

- this,

- ModelTypeSetToObjectIdSet(enabled_types));

+ CHECK(invalidator_->UpdateRegisteredInvalidationIds(

+ this, ModelTypeSetToObjectIdSet(enabled_types)));

}

// TODO(erikchen): Remove ScopedTracker below once http://crbug.com/458406 is