Finish decoupling sync and invalidations

chrome/browser/chromeos/policy/device_cloud_policy_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 "chrome/browser/chromeos/policy/device_cloud_policy_invalidator.h"
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/run_loop.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
 #include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "chromeos/cryptohome/system_salt_getter.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
+#include "components/invalidation/invalidator_state.h"
 #include "components/invalidation/profile_invalidation_provider.h"
 #include "components/invalidation/ticl_invalidation_service.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_test_util.h"
-#include "sync/internal_api/public/base/invalidator_state.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace policy {
 
 class DeviceCloudPolicyInvalidatorTest : public testing::Test {
  public:
   DeviceCloudPolicyInvalidatorTest();
   virtual ~DeviceCloudPolicyInvalidatorTest();
 
   // testing::Test:
@@ skipping 377 matching lines @@
   EXPECT_TRUE(profile_2_invalidation_service);
   EXPECT_EQ(2, GetProfileInvalidationServiceObserverCount());
 
   // Verify that an invalidator backed by the device-global invalidation service
   // has been created.
   EXPECT_TRUE(HasCloudPolicyInvalidator());
   EXPECT_EQ(GetDeviceInvalidationService(), GetInvalidationService());
 }
 
 }  // namespace policy