[Sync] InvalidationService shouldn't CHECK when registering ObjectId for more than one handler

components/invalidation/non_blocking_invalidator.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/invalidation/non_blocking_invalidator.h"
 
 #include <cstddef>
 
 #include "base/location.h"
 #include "base/logging.h"
@@ skipping 256 matching lines @@
                      core_.get()))) {
     DVLOG(1) << "Network thread stopped before invalidator is destroyed.";
   }
 }
 
 void NonBlockingInvalidator::RegisterHandler(InvalidationHandler* handler) {
   DCHECK(parent_task_runner_->BelongsToCurrentThread());
   registrar_.RegisterHandler(handler);
 }
 
-void NonBlockingInvalidator::UpdateRegisteredIds(InvalidationHandler* handler,
+bool NonBlockingInvalidator::UpdateRegisteredIds(InvalidationHandler* handler,
                                                  const ObjectIdSet& ids) {
   DCHECK(parent_task_runner_->BelongsToCurrentThread());
-  registrar_.UpdateRegisteredIds(handler, ids);
+  if (!registrar_.UpdateRegisteredIds(handler, ids))
+    return false;
   if (!network_task_runner_->PostTask(
           FROM_HERE,
           base::Bind(
               &NonBlockingInvalidator::Core::UpdateRegisteredIds,
               core_.get(),
               registrar_.GetAllRegisteredIds()))) {
     NOTREACHED();
   }
+  return true;
 }
 
 void NonBlockingInvalidator::UnregisterHandler(InvalidationHandler* handler) {
   DCHECK(parent_task_runner_->BelongsToCurrentThread());
   registrar_.UnregisterHandler(handler);
 }
 
 InvalidatorState NonBlockingInvalidator::GetInvalidatorState() const {
   DCHECK(parent_task_runner_->BelongsToCurrentThread());
   return registrar_.GetInvalidatorState();
@@ skipping 82 matching lines @@
 
 void NonBlockingInvalidator::OnIncomingInvalidation(
         const ObjectIdInvalidationMap& invalidation_map) {
   DCHECK(parent_task_runner_->BelongsToCurrentThread());
   registrar_.DispatchInvalidationsToHandlers(invalidation_map);
 }
 
 std::string NonBlockingInvalidator::GetOwnerName() const { return "Sync"; }
 
 }  // namespace syncer