Finish decoupling sync and invalidations

components/invalidation/invalidation_service_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 InvalidationService should
 // pass in order to be conformant.  Here's how you use it to test your
 // implementation.
 //
 // Say your class is called MyInvalidationService.  Then you need to define a
 // class called MyInvalidationServiceTestDelegate in
@@ skipping 55 matching lines @@
 //       InvalidationServiceTest,
 //       MyInvalidatorTestDelegate);
 //
 // Easy!
 
 #ifndef COMPONENTS_INVALIDATION_INVALIDATION_SERVICE_TEST_TEMPLATE_H_
 #define COMPONENTS_INVALIDATION_INVALIDATION_SERVICE_TEST_TEMPLATE_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "components/invalidation/ack_handle.h"
 #include "components/invalidation/fake_invalidation_handler.h"
+#include "components/invalidation/invalidation.h"
 #include "components/invalidation/invalidation_service.h"
 #include "components/invalidation/object_id_invalidation_map.h"
 #include "components/invalidation/object_id_invalidation_map_test_util.h"
 #include "google/cacheinvalidation/include/types.h"
 #include "google/cacheinvalidation/types.pb.h"
-#include "sync/internal_api/public/base/ack_handle.h"
-#include "sync/internal_api/public/base/invalidation.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 template <typename InvalidatorTestDelegate>
 class InvalidationServiceTest : public testing::Test {
  protected:
   InvalidationServiceTest()
       : id1(ipc::invalidation::ObjectSource::CHROME_SYNC, "BOOKMARK"),
         id2(ipc::invalidation::ObjectSource::CHROME_SYNC, "PREFERENCE"),
         id3(ipc::invalidation::ObjectSource::CHROME_SYNC, "AUTOFILL"),
         id4(ipc::invalidation::ObjectSource::CHROME_PUSH_MESSAGING,
@@ skipping 285 matching lines @@
             handler.GetLastRetrievedState());
 
   invalidator->UnregisterInvalidationHandler(&handler);
 }
 
 REGISTER_TYPED_TEST_CASE_P(InvalidationServiceTest,
                            Basic, MultipleHandlers, EmptySetUnregisters,
                            GetInvalidatorStateAlwaysCurrent);
 
 #endif  // COMPONENTS_INVALIDATION_INVALIDATION_SERVICE_TEST_TEMPLATE_H_