chrome/browser/policy/cloud/cloud_policy_invalidator.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/policy/cloud/cloud_policy_invalidator.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/cloud_policy_invalidator.h ('k') | chrome/browser/policy/cloud/remote_commands_invalidator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/policy/cloud/cloud_policy_invalidator.cc

diff --git a/chrome/browser/policy/cloud/cloud_policy_invalidator.cc b/chrome/browser/policy/cloud/cloud_policy_invalidator.cc

index c197f978203fb85fa1fb394f5f001a214118ed55..02bd109b854e86e9899443e8720ebc531793494b 100644

--- a/chrome/browser/policy/cloud/cloud_policy_invalidator.cc

+++ b/chrome/browser/policy/cloud/cloud_policy_invalidator.cc

@@ -308,16 +308,15 @@ void CloudPolicyInvalidator::Register(const invalidation::ObjectId& object_id) {

// Update registration with the invalidation service.

syncer::ObjectIdSet ids;

ids.insert(object_id);

- invalidation_service_->UpdateRegisteredInvalidationIds(this, ids);

+ CHECK(invalidation_service_->UpdateRegisteredInvalidationIds(this, ids));

}

void CloudPolicyInvalidator::Unregister() {

if (is_registered_) {

if (invalid_)

AcknowledgeInvalidation();

- invalidation_service_->UpdateRegisteredInvalidationIds(

- this,

- syncer::ObjectIdSet());

+ CHECK(invalidation_service_->UpdateRegisteredInvalidationIds(

+ this, syncer::ObjectIdSet()));

invalidation_service_->UnregisterInvalidationHandler(this);

is_registered_ = false;

UpdateInvalidationsEnabled();