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

chrome/browser/sync/profile_sync_service_unittest.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 "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/values.h"
@@ skipping 162 matching lines @@
 TEST_F(ProfileSyncServiceTest, InitialState) {
   SigninManager* signin =
       SigninManagerFactory::GetForProfile(harness_.profile.get());
   harness_.service.reset(new TestProfileSyncService(
       new ProfileSyncComponentsFactoryMock(),
       harness_.profile.get(),
       signin,
       ProfileSyncService::MANUAL_START,
       true,
       base::Closure()));
+  harness_.service->Initialize();
   EXPECT_TRUE(
       harness_.service->sync_service_url().spec() ==
         ProfileSyncService::kSyncServerUrl ||
       harness_.service->sync_service_url().spec() ==
         ProfileSyncService::kDevServerUrl);
 }
 
 TEST_F(ProfileSyncServiceTest, DisabledByPolicy) {
   harness_.profile->GetTestingPrefService()->SetManagedPref(
       prefs::kSyncManaged,
@@ skipping 230 matching lines @@
   backend->EmitOnInvalidatorStateChange(syncer::INVALIDATIONS_ENABLED);
   EXPECT_EQ(syncer::INVALIDATIONS_ENABLED, handler.GetInvalidatorState());
 
   backend->EmitOnIncomingInvalidation(states, syncer::REMOTE_INVALIDATION);
   EXPECT_THAT(states, Eq(handler.GetLastInvalidationMap()));
   EXPECT_EQ(syncer::REMOTE_INVALIDATION, handler.GetLastInvalidationSource());
 
   backend->EmitOnInvalidatorStateChange(syncer::TRANSIENT_INVALIDATION_ERROR);
   EXPECT_EQ(syncer::TRANSIENT_INVALIDATION_ERROR,
             handler.GetInvalidatorState());
+
+  harness_.service->UnregisterInvalidationHandler(&handler);
 }
 
 // Thin Invalidator wrapper around ProfileSyncService.
 class ProfileSyncServiceInvalidator : public syncer::Invalidator {
  public:
   explicit ProfileSyncServiceInvalidator(ProfileSyncService* service)
       : service_(service) {}
 
   virtual ~ProfileSyncServiceInvalidator() {}
 
@@ skipping 102 matching lines @@
 namespace syncer {
 namespace {
 
 // ProfileSyncService should behave just like an invalidator.
 INSTANTIATE_TYPED_TEST_CASE_P(
     ProfileSyncServiceInvalidatorTest, InvalidatorTest,
     ::browser_sync::ProfileSyncServiceInvalidatorTestDelegate);
 
 }  // namespace
 }  // namespace syncer