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

chrome/browser/sync/glue/sync_backend_host_impl.cc

 // Copyright 2013 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 "chrome/browser/sync/glue/sync_backend_host_impl.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/profiler/scoped_tracker.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 300 matching lines @@
                  base::Unretained(detached_registrar)));
 
   if (sync_thread_claimed)
     return detached_registrar->ReleaseSyncThread();
   else
     return scoped_ptr<base::Thread>();
 }
 
 void SyncBackendHostImpl::UnregisterInvalidationIds() {
   if (invalidation_handler_registered_) {
-    invalidator_->UpdateRegisteredInvalidationIds(
-        this,
-        syncer::ObjectIdSet());
+    CHECK(invalidator_->UpdateRegisteredInvalidationIds(this,
+                                                        syncer::ObjectIdSet()));
   }
 }
 
 syncer::ModelTypeSet SyncBackendHostImpl::ConfigureDataTypes(
     syncer::ConfigureReason reason,
     const DataTypeConfigStateMap& config_state_map,
     const base::Callback<void(syncer::ModelTypeSet, syncer::ModelTypeSet)>&
         ready_task,
     const base::Callback<void()>& retry_callback) {
   // Only one configure is allowed at a time.  This is guaranteed by our
@@ skipping 283 matching lines @@
                               syncer::ModelTypeSet)>& ready_task) {
   // TODO(erikchen): Remove ScopedTracker below once http://crbug.com/458406 is
   // fixed.
   tracked_objects::ScopedTracker tracking_profile1(
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "458406 SyncBackendHostImpl::FinishConfigureDataTOFL"));
   if (!frontend_)
     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
   // fixed.
   tracked_objects::ScopedTracker tracking_profile2(
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "458406 SyncBackendHostImpl::FinishConfigureDataTOFL::ReadyTask"));
   if (!ready_task.is_null())
     ready_task.Run(succeeded_configuration_types, failed_configuration_types);
 }
@@ skipping 258 matching lines @@
 
 base::MessageLoop* SyncBackendHostImpl::GetSyncLoopForTesting() {
   return registrar_->sync_thread()->message_loop();
 }
 
 }  // namespace browser_sync
 
 #undef SDVLOG
 
 #undef SLOG