[Invalidations] Require there to be no registered handlers on Invalidator destruction

sync/notifier/invalidator_test_template.h

 // 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.
 
 // This class defines tests that implementations of Invalidator should pass in
 // order to be conformant.  Here's how you use it to test your implementation.
 //
 // Say your class is called MyInvalidator.  Then you need to define a class
 // called MyInvalidatorTestDelegate in my_sync_notifier_unittest.cc like this:
 //
@@ skipping 265 matching lines @@
 
     EXPECT_EQ(0, handler3.GetInvalidationCount());
     EXPECT_EQ(0, handler4.GetInvalidationCount());
   }
 
   this->delegate_.TriggerOnInvalidatorStateChange(TRANSIENT_INVALIDATION_ERROR);
   EXPECT_EQ(TRANSIENT_INVALIDATION_ERROR, handler1.GetInvalidatorState());
   EXPECT_EQ(TRANSIENT_INVALIDATION_ERROR, handler2.GetInvalidatorState());
   EXPECT_EQ(TRANSIENT_INVALIDATION_ERROR, handler3.GetInvalidatorState());
   EXPECT_EQ(TRANSIENT_INVALIDATION_ERROR, handler4.GetInvalidatorState());
+
+  invalidator->UnregisterHandler(&handler3);
+  invalidator->UnregisterHandler(&handler2);
+  invalidator->UnregisterHandler(&handler1);
 }
 
 // Make sure that passing an empty set to UpdateRegisteredIds clears the
 // corresponding entries for the handler.
 TYPED_TEST_P(InvalidatorTest, EmptySetUnregisters) {
   Invalidator* const invalidator = this->CreateAndInitializeInvalidator();
 
   FakeInvalidationHandler handler1;
 
   // Control observer.
@@ skipping 29 matching lines @@
     states[this->id2].payload = "2";
     states[this->id3].payload = "3";
     this->delegate_.TriggerOnIncomingInvalidation(states, REMOTE_INVALIDATION);
     EXPECT_EQ(0, handler1.GetInvalidationCount());
     EXPECT_EQ(1, handler2.GetInvalidationCount());
   }
 
   this->delegate_.TriggerOnInvalidatorStateChange(TRANSIENT_INVALIDATION_ERROR);
   EXPECT_EQ(TRANSIENT_INVALIDATION_ERROR, handler1.GetInvalidatorState());
   EXPECT_EQ(TRANSIENT_INVALIDATION_ERROR, handler2.GetInvalidatorState());
+
+  invalidator->UnregisterHandler(&handler2);
+  invalidator->UnregisterHandler(&handler1);
 }
 
 namespace internal {
 
 // A FakeInvalidationHandler that is "bound" to a specific
 // Invalidator.  This is for cross-referencing state information with
 // the bound Invalidator.
 class BoundFakeInvalidationHandler : public FakeInvalidationHandler {
  public:
   explicit BoundFakeInvalidationHandler(const Invalidator& invalidator);
@@ skipping 22 matching lines @@
   internal::BoundFakeInvalidationHandler handler(*invalidator);
   invalidator->RegisterHandler(&handler);
 
   this->delegate_.TriggerOnInvalidatorStateChange(INVALIDATIONS_ENABLED);
   EXPECT_EQ(INVALIDATIONS_ENABLED, handler.GetInvalidatorState());
   EXPECT_EQ(INVALIDATIONS_ENABLED, handler.GetLastRetrievedState());
 
   this->delegate_.TriggerOnInvalidatorStateChange(TRANSIENT_INVALIDATION_ERROR);
   EXPECT_EQ(TRANSIENT_INVALIDATION_ERROR, handler.GetInvalidatorState());
   EXPECT_EQ(TRANSIENT_INVALIDATION_ERROR, handler.GetLastRetrievedState());
+
+  invalidator->UnregisterHandler(&handler);
 }
 
 // Initialize the invalidator with no bootstrap data.  Call the deprecated
 // state setter function a number of times, destroying and re-creating the
 // invalidator in between.  Only the first one should take effect (i.e.,
 // migration of bootstrap data should only happen once)
 TYPED_TEST_P(InvalidatorTest, MigrateState) {
   if (!this->delegate_.InvalidatorHandlesDeprecatedState()) {
     DLOG(INFO) << "This Invalidator doesn't handle deprecated state; "
                << "skipping";
@@ skipping 25 matching lines @@
   EXPECT_EQ("fake_state", this->fake_tracker_.GetBootstrapData());
 }
 
 REGISTER_TYPED_TEST_CASE_P(InvalidatorTest,
                            Basic, MultipleHandlers, EmptySetUnregisters,
                            GetInvalidatorStateAlwaysCurrent, MigrateState);
 
 }  // namespace syncer
 
 #endif  // SYNC_NOTIFIER_INVALIDATOR_TEST_TEMPLATE_H_