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

components/invalidation/invalidator_registrar_unittest.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 "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "components/invalidation/fake_invalidation_handler.h"
 #include "components/invalidation/invalidator_registrar.h"
 #include "components/invalidation/invalidator_test_template.h"
@@ skipping 15 matching lines @@
 
   InvalidatorRegistrar* GetRegistrar() {
     return &registrar_;
   }
 
   // Invalidator implementation.
   void RegisterHandler(InvalidationHandler* handler) override {
     registrar_.RegisterHandler(handler);
   }
 
-  void UpdateRegisteredIds(InvalidationHandler* handler,
+  bool UpdateRegisteredIds(InvalidationHandler* handler,
                            const ObjectIdSet& ids) override {
-    registrar_.UpdateRegisteredIds(handler, ids);
+    return registrar_.UpdateRegisteredIds(handler, ids);
   }
 
   void UnregisterHandler(InvalidationHandler* handler) override {
     registrar_.UnregisterHandler(handler);
   }
 
   InvalidatorState GetInvalidatorState() const override {
     return registrar_.GetInvalidatorState();
   }
 
@@ skipping 53 matching lines @@
   }
 
  private:
   scoped_ptr<RegistrarInvalidator> invalidator_;
 };
 
 INSTANTIATE_TYPED_TEST_CASE_P(
     RegistrarInvalidatorTest, InvalidatorTest,
     RegistrarInvalidatorTestDelegate);
 
-class InvalidatorRegistrarTest : public testing::Test {};
-
-// Technically the test below can be part of InvalidatorTest, but we
-// want to keep the number of death tests down.
-
-// When we expect a death via CHECK(), we can't match against the
-// CHECK() message since they are removed in official builds.
-
-#if GTEST_HAS_DEATH_TEST
-
-// Multiple registrations by different handlers on the same object ID should
-// cause a CHECK.
-TEST_F(InvalidatorRegistrarTest, MultipleRegistration) {
-  const invalidation::ObjectId id1(ipc::invalidation::ObjectSource::TEST, "a");
-  const invalidation::ObjectId id2(ipc::invalidation::ObjectSource::TEST, "a");
-
-  InvalidatorRegistrar registrar;
-
-  FakeInvalidationHandler handler1;
-  registrar.RegisterHandler(&handler1);
-
-  FakeInvalidationHandler handler2;
-  registrar.RegisterHandler(&handler2);
-
-  ObjectIdSet ids;
-  ids.insert(id1);
-  ids.insert(id2);
-  registrar.UpdateRegisteredIds(&handler1, ids);
-
-  registrar.DetachFromThreadForTest();
-  EXPECT_DEATH({ registrar.UpdateRegisteredIds(&handler2, ids); }, "");
-
-  registrar.UnregisterHandler(&handler2);
-  registrar.UnregisterHandler(&handler1);
-}
-#endif  // GTEST_HAS_DEATH_TEST
-
 }  // namespace
 
 }  // namespace syncer