Finish decoupling sync and invalidations

components/invalidation/p2p_invalidator_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 "components/invalidation/p2p_invalidator.h"
 
 #include <cstddef>
 
 #include "components/invalidation/fake_invalidation_handler.h"
+#include "components/invalidation/invalidator_state.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 "testing/gtest/include/gtest/gtest.h"
 
 namespace syncer {
 
 namespace {
 
 class P2PInvalidatorTestDelegate {
  public:
   P2PInvalidatorTestDelegate() : fake_push_client_(NULL) {}
 
@@ skipping 325 matching lines @@
   EXPECT_EQ(5, fake_handler_.GetInvalidationCount());
 }
 
 INSTANTIATE_TYPED_TEST_CASE_P(
     P2PInvalidatorTest, InvalidatorTest,
     P2PInvalidatorTestDelegate);
 
 }  // namespace
 
 }  // namespace syncer