Retry: Move some sync/notifier to components/invalidation

components/invalidation/p2p_invalidator_unittest.cc

Index: components/invalidation/p2p_invalidator_unittest.cc
diff --git a/sync/notifier/p2p_invalidator_unittest.cc b/components/invalidation/p2p_invalidator_unittest.cc
similarity index 97%
rename from sync/notifier/p2p_invalidator_unittest.cc
rename to components/invalidation/p2p_invalidator_unittest.cc
index 9f0b273887ee5670ba8a8e1f6805114e5e3cd1f7..150a91a96cf7a68d00ee66a9a52d48455f73a10d 100644
--- a/sync/notifier/p2p_invalidator_unittest.cc
+++ b/components/invalidation/p2p_invalidator_unittest.cc
@@ -2,14 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sync/notifier/p2p_invalidator.h"
+#include "components/invalidation/p2p_invalidator.h"
 
 #include <cstddef>
 
+#include "components/invalidation/fake_invalidation_handler.h"
+#include "components/invalidation/invalidator_test_template.h"
+#include "components/invalidation/notifier_reason_util.h"
 #include "jingle/notifier/listener/fake_push_client.h"
+#include "sync/internal_api/public/base/invalidator_state.h"
 #include "sync/internal_api/public/base/model_type.h"
-#include "sync/notifier/fake_invalidation_handler.h"
-#include "sync/notifier/invalidator_test_template.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace syncer {