Retry: Move some sync/notifier to components/invalidation

components/invalidation/invalidator_test_template.h

 // 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.
 
 // 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 56 matching lines @@
 // tests.
 //
 // Then you simply #include this file as well as gtest.h and add the
 // following statement to my_sync_notifier_unittest.cc:
 //
 //   INSTANTIATE_TYPED_TEST_CASE_P(
 //       MyInvalidator, InvalidatorTest, MyInvalidatorTestDelegate);
 //
 // Easy!
 
-#ifndef SYNC_NOTIFIER_INVALIDATOR_TEST_TEMPLATE_H_
-#define SYNC_NOTIFIER_INVALIDATOR_TEST_TEMPLATE_H_
+#ifndef COMPONENTS_INVALIDATION_INVALIDATOR_TEST_TEMPLATE_H_
+#define COMPONENTS_INVALIDATION_INVALIDATOR_TEST_TEMPLATE_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "components/invalidation/fake_invalidation_handler.h"
+#include "components/invalidation/fake_invalidation_state_tracker.h"
 #include "google/cacheinvalidation/include/types.h"
 #include "google/cacheinvalidation/types.pb.h"
 #include "sync/internal_api/public/base/object_id_invalidation_map_test_util.h"
-#include "sync/notifier/fake_invalidation_handler.h"
-#include "sync/notifier/fake_invalidation_state_tracker.h"
 #include "sync/notifier/invalidator.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace syncer {
 
 template <typename InvalidatorTestDelegate>
 class InvalidatorTest : public testing::Test {
  protected:
   InvalidatorTest()
       : id1(ipc::invalidation::ObjectSource::TEST, "a"),
@@ skipping 270 matching lines @@
 
   invalidator->UnregisterHandler(&handler);
 }
 
 REGISTER_TYPED_TEST_CASE_P(InvalidatorTest,
                            Basic, MultipleHandlers, EmptySetUnregisters,
                            GetInvalidatorStateAlwaysCurrent);
 
 }  // namespace syncer
 
-#endif  // SYNC_NOTIFIER_INVALIDATOR_TEST_TEMPLATE_H_
+#endif  // COMPONENTS_INVALIDATION_INVALIDATOR_TEST_TEMPLATE_H_