Retry: Move some sync/notifier to components/invalidation

components/invalidation/invalidation_notifier_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 "sync/notifier/invalidation_notifier.h"
+#include "components/invalidation/invalidation_notifier.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
+#include "components/invalidation/fake_invalidation_handler.h"
+#include "components/invalidation/fake_invalidation_state_tracker.h"
+#include "components/invalidation/invalidator_test_template.h"
+#include "components/invalidation/push_client_channel.h"
 #include "jingle/notifier/base/fake_base_task.h"
 #include "jingle/notifier/base/notifier_options.h"
 #include "jingle/notifier/listener/fake_push_client.h"
 #include "net/url_request/url_request_test_util.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/internal_api/public/util/weak_handle.h"
-#include "sync/notifier/fake_invalidation_handler.h"
-#include "sync/notifier/fake_invalidation_state_tracker.h"
 #include "sync/notifier/invalidation_state_tracker.h"
-#include "sync/notifier/invalidator_test_template.h"
-#include "sync/notifier/push_client_channel.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace syncer {
 
 namespace {
 
 class InvalidationNotifierTestDelegate {
  public:
   InvalidationNotifierTestDelegate() {}
 
@@ skipping 53 matching lines @@
   scoped_ptr<InvalidationNotifier> invalidator_;
 };
 
 INSTANTIATE_TYPED_TEST_CASE_P(
     InvalidationNotifierTest, InvalidatorTest,
     InvalidationNotifierTestDelegate);
 
 }  // namespace
 
 }  // namespace syncer