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

components/invalidation/invalidation_service_android.cc

Index: components/invalidation/invalidation_service_android.cc
diff --git a/components/invalidation/invalidation_service_android.cc b/components/invalidation/invalidation_service_android.cc
index cccad4015fbb9e77e78439b0a1b51414dd4e2862..adab880172849b723ef73d8c7a644fe8ff3b3722 100644
--- a/components/invalidation/invalidation_service_android.cc
+++ b/components/invalidation/invalidation_service_android.cc
@@ -38,14 +38,15 @@ void InvalidationServiceAndroid::RegisterInvalidationHandler(
   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();
 
@@ -66,6 +67,7 @@ void InvalidationServiceAndroid::UpdateRegisteredInvalidationIds(
       base::android::ToJavaArrayOfStrings(env, names).obj());
 
   logger_.OnUpdateIds(invalidator_registrar_.GetSanitizedHandlersIdsMap());
+  return true;
 }
 
 void InvalidationServiceAndroid::UnregisterInvalidationHandler(