Finish decoupling sync and invalidations

components/invalidation/single_object_invalidation_set_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/single_object_invalidation_set.h"
 
+#include "components/invalidation/invalidation_test_util.h"
 #include "google/cacheinvalidation/types.pb.h"
-#include "sync/internal_api/public/base/invalidation_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace syncer {
 
 namespace {
 
 class SingleObjectInvalidationSetTest : public testing::Test {
  public:
   SingleObjectInvalidationSetTest()
       : kId(ipc::invalidation::ObjectSource::TEST, "one") {
@@ skipping 82 matching lines @@
   scoped_ptr<base::ListValue> value = list.ToValue();
   ASSERT_TRUE(value.get());
   SingleObjectInvalidationSet deserialized;
   deserialized.ResetFromValue(*value.get());
   EXPECT_TRUE(list == deserialized);
 }
 
 }  // namespace
 
 }  // namespace syncer