Refactor common invalidation framework types

sync/notifier/invalidator_registrar_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/memory/scoped_ptr.h"
 #include "google/cacheinvalidation/types.pb.h"
 #include "sync/notifier/fake_invalidation_handler.h"
 #include "sync/notifier/invalidator_registrar.h"
 #include "sync/notifier/invalidator_test_template.h"
-#include "sync/notifier/object_id_invalidation_map_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace syncer {
 
 namespace {
 
 // We test InvalidatorRegistrar by wrapping it in an Invalidator and
 // running the usual Invalidator tests.
 
 // Thin Invalidator wrapper around InvalidatorRegistrar.
@@ skipping 132 matching lines @@
   EXPECT_DEATH({ registrar.UpdateRegisteredIds(&handler2, ids); }, "");
 
   registrar.UnregisterHandler(&handler2);
   registrar.UnregisterHandler(&handler1);
 }
 #endif  // GTEST_HAS_DEATH_TEST
 
 }  // namespace
 
 }  // namespace syncer