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

components/invalidation/invalidation_service_android.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/invalidation_service_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/callback.h"
@@ skipping 20 matching lines @@
 
 InvalidationServiceAndroid::~InvalidationServiceAndroid() { }
 
 void InvalidationServiceAndroid::RegisterInvalidationHandler(
     syncer::InvalidationHandler* handler) {
   DCHECK(CalledOnValidThread());
   invalidator_registrar_.RegisterHandler(handler);
   logger_.OnRegistration(handler->GetOwnerName());
 }
 
-void InvalidationServiceAndroid::UpdateRegisteredInvalidationIds(
+bool InvalidationServiceAndroid::UpdateRegisteredInvalidationIds(
     syncer::InvalidationHandler* handler,
     const syncer::ObjectIdSet& ids) {
   DCHECK(CalledOnValidThread());
   JNIEnv* env = base::android::AttachCurrentThread();
   DCHECK(env);
 
-  invalidator_registrar_.UpdateRegisteredIds(handler, ids);
+  if (!invalidator_registrar_.UpdateRegisteredIds(handler, ids))
+    return false;
   const syncer::ObjectIdSet& registered_ids =
       invalidator_registrar_.GetAllRegisteredIds();
 
   // To call the corresponding method on the Java invalidation service, split
   // the object ids into object source and object name arrays.
   std::vector<int> sources;
   std::vector<std::string> names;
   syncer::ObjectIdSet::const_iterator id;
   for (id = registered_ids.begin(); id != registered_ids.end(); ++id) {
     sources.push_back(id->source());
     names.push_back(id->name());
   }
 
   Java_InvalidationService_setRegisteredObjectIds(
       env,
       java_ref_.obj(),
       base::android::ToJavaIntArray(env, sources).obj(),
       base::android::ToJavaArrayOfStrings(env, names).obj());
 
   logger_.OnUpdateIds(invalidator_registrar_.GetSanitizedHandlersIdsMap());
+  return true;
 }
 
 void InvalidationServiceAndroid::UnregisterInvalidationHandler(
     syncer::InvalidationHandler* handler) {
   DCHECK(CalledOnValidThread());
   invalidator_registrar_.UnregisterHandler(handler);
   logger_.OnUnregistration(handler->GetOwnerName());
 }
 
 syncer::InvalidatorState
@@ skipping 88 matching lines @@
       effective_invalidation_map);
   logger_.OnInvalidation(effective_invalidation_map);
 }
 
 // static
 bool InvalidationServiceAndroid::RegisterJni(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace invalidation