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

sync/tools/sync_client.cc

 // Copyright (c) 2012 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 <cstddef>
 #include <cstdio>
 #include <string>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
@@ skipping 427 matching lines @@
   args.encryptor = &null_encryptor;
   args.unrecoverable_error_handler.reset(new LoggingUnrecoverableErrorHandler);
   args.report_unrecoverable_error_function = &LogUnrecoverableErrorContext;
   args.cancelation_signal = &scm_cancelation_signal;
   sync_manager->Init(&args);
   // TODO(akalin): Avoid passing in model parameters multiple times by
   // organizing handling of model types.
   invalidator->UpdateCredentials(credentials.email, credentials.sync_token);
   scoped_ptr<InvalidatorShim> shim(new InvalidatorShim(sync_manager.get()));
   invalidator->RegisterHandler(shim.get());
-  invalidator->UpdateRegisteredIds(
-      shim.get(), ModelTypeSetToObjectIdSet(model_types));
+  CHECK(invalidator->UpdateRegisteredIds(
+      shim.get(), ModelTypeSetToObjectIdSet(model_types)));
   sync_manager->StartSyncingNormally(routing_info, base::Time());
 
   sync_loop.Run();
 
   io_thread.Stop();
   return 0;
 }
 
 }  // namespace
 }  // namespace syncer
 
 int main(int argc, char* argv[]) {
   return syncer::SyncClientMain(argc, argv);
 }