summaryrefslogtreecommitdiffstats
path: root/sync/tools
diff options
context:
space:
mode:
authorrlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-24 01:13:47 +0000
committerrlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-24 01:13:47 +0000
commit51766bfd768a22b11f2d5cb95e18d086596c5947 (patch)
tree1c91322e369ca29da5e5b20740d3977c620fba22 /sync/tools
parente844799efba8481511305dc63a663c6cf9f7977b (diff)
downloadchromium_src-51766bfd768a22b11f2d5cb95e18d086596c5947.zip
chromium_src-51766bfd768a22b11f2d5cb95e18d086596c5947.tar.gz
chromium_src-51766bfd768a22b11f2d5cb95e18d086596c5947.tar.bz2
Finish decoupling sync and invalidations
Moves the remaining invalidations code from sync/internal_api/public/base/ to components/invalidation/. TBR=atwilson BUG=259559 Review URL: https://codereview.chromium.org/400073003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285102 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/tools')
-rw-r--r--sync/tools/invalidation_helper.h2
-rw-r--r--sync/tools/null_invalidation_state_tracker.cc2
-rw-r--r--sync/tools/sync_listen_notifications.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/sync/tools/invalidation_helper.h b/sync/tools/invalidation_helper.h
index 9d45253..455998d 100644
--- a/sync/tools/invalidation_helper.h
+++ b/sync/tools/invalidation_helper.h
@@ -5,8 +5,8 @@
#ifndef SYNC_TOOLS_INVALIDATION_HELPER_H_
#define SYNC_TOOLS_INVALIDATION_HELPER_H_
+#include "components/invalidation/invalidation_util.h"
#include "google/cacheinvalidation/include/types.h"
-#include "sync/internal_api/public/base/invalidation_util.h"
#include "sync/internal_api/public/base/model_type.h"
namespace syncer {
diff --git a/sync/tools/null_invalidation_state_tracker.cc b/sync/tools/null_invalidation_state_tracker.cc
index 24e8655..49d1af3 100644
--- a/sync/tools/null_invalidation_state_tracker.cc
+++ b/sync/tools/null_invalidation_state_tracker.cc
@@ -10,7 +10,7 @@
#include "base/location.h"
#include "base/logging.h"
#include "base/task_runner.h"
-#include "sync/internal_api/public/base/invalidation_util.h"
+#include "components/invalidation/invalidation_util.h"
namespace syncer {
diff --git a/sync/tools/sync_listen_notifications.cc b/sync/tools/sync_listen_notifications.cc
index a7fb571..adbf4af 100644
--- a/sync/tools/sync_listen_notifications.cc
+++ b/sync/tools/sync_listen_notifications.cc
@@ -17,6 +17,7 @@
#include "base/threading/thread.h"
#include "components/invalidation/invalidation_handler.h"
#include "components/invalidation/invalidation_state_tracker.h"
+#include "components/invalidation/invalidation_util.h"
#include "components/invalidation/invalidator.h"
#include "components/invalidation/non_blocking_invalidator.h"
#include "components/invalidation/object_id_invalidation_map.h"
@@ -27,7 +28,6 @@
#include "net/dns/host_resolver.h"
#include "net/http/transport_security_state.h"
#include "net/url_request/url_request_test_util.h"
-#include "sync/internal_api/public/base/invalidation_util.h"
#include "sync/internal_api/public/base/model_type.h"
#include "sync/tools/invalidation_helper.h"
#include "sync/tools/null_invalidation_state_tracker.h"