summaryrefslogtreecommitdiffstats
path: root/sync/notifier
diff options
context:
space:
mode:
Diffstat (limited to 'sync/notifier')
-rw-r--r--sync/notifier/DEPS1
-rw-r--r--sync/notifier/chrome_invalidation_client.h2
-rw-r--r--sync/notifier/chrome_invalidation_client_unittest.cc2
-rw-r--r--sync/notifier/invalidation_notifier.h2
-rw-r--r--sync/notifier/invalidation_notifier_unittest.cc2
-rw-r--r--sync/notifier/non_blocking_invalidation_notifier.h2
-rw-r--r--sync/notifier/non_blocking_invalidation_notifier_unittest.cc2
-rw-r--r--sync/notifier/sync_notifier_factory.h2
8 files changed, 8 insertions, 7 deletions
diff --git a/sync/notifier/DEPS b/sync/notifier/DEPS
index 4c55aa9..b718f9e 100644
--- a/sync/notifier/DEPS
+++ b/sync/notifier/DEPS
@@ -6,6 +6,7 @@ include_rules = [
"+net/url_request/url_request_test_util.h",
"+sync/internal_api/public/syncable",
+ "+sync/internal_api/public/util",
"+sync/protocol/service_constants.h",
"+sync/util",
diff --git a/sync/notifier/chrome_invalidation_client.h b/sync/notifier/chrome_invalidation_client.h
index ce0939b..fe25dc3 100644
--- a/sync/notifier/chrome_invalidation_client.h
+++ b/sync/notifier/chrome_invalidation_client.h
@@ -19,10 +19,10 @@
#include "google/cacheinvalidation/include/invalidation-listener.h"
#include "sync/internal_api/public/syncable/model_type.h"
#include "sync/internal_api/public/syncable/model_type_payload_map.h"
+#include "sync/internal_api/public/util/weak_handle.h"
#include "sync/notifier/chrome_system_resources.h"
#include "sync/notifier/invalidation_state_tracker.h"
#include "sync/notifier/state_writer.h"
-#include "sync/util/weak_handle.h"
namespace buzz {
class XmppTaskParentInterface;
diff --git a/sync/notifier/chrome_invalidation_client_unittest.cc b/sync/notifier/chrome_invalidation_client_unittest.cc
index 92f697f12..f1470ac 100644
--- a/sync/notifier/chrome_invalidation_client_unittest.cc
+++ b/sync/notifier/chrome_invalidation_client_unittest.cc
@@ -11,9 +11,9 @@
#include "jingle/notifier/listener/fake_push_client.h"
#include "sync/internal_api/public/syncable/model_type.h"
#include "sync/internal_api/public/syncable/model_type_payload_map.h"
+#include "sync/internal_api/public/util/weak_handle.h"
#include "sync/notifier/chrome_invalidation_client.h"
#include "sync/notifier/mock_invalidation_state_tracker.h"
-#include "sync/util/weak_handle.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/sync/notifier/invalidation_notifier.h b/sync/notifier/invalidation_notifier.h
index f7f2efd..4ac715e 100644
--- a/sync/notifier/invalidation_notifier.h
+++ b/sync/notifier/invalidation_notifier.h
@@ -21,10 +21,10 @@
#include "base/observer_list.h"
#include "base/threading/non_thread_safe.h"
#include "sync/internal_api/public/syncable/model_type.h"
+#include "sync/internal_api/public/util/weak_handle.h"
#include "sync/notifier/chrome_invalidation_client.h"
#include "sync/notifier/invalidation_state_tracker.h"
#include "sync/notifier/sync_notifier.h"
-#include "sync/util/weak_handle.h"
namespace notifier {
class PushClient;
diff --git a/sync/notifier/invalidation_notifier_unittest.cc b/sync/notifier/invalidation_notifier_unittest.cc
index 8219ad8..16b70c1 100644
--- a/sync/notifier/invalidation_notifier_unittest.cc
+++ b/sync/notifier/invalidation_notifier_unittest.cc
@@ -12,10 +12,10 @@
#include "net/url_request/url_request_test_util.h"
#include "sync/internal_api/public/syncable/model_type.h"
#include "sync/internal_api/public/syncable/model_type_payload_map.h"
+#include "sync/internal_api/public/util/weak_handle.h"
#include "sync/notifier/invalidation_state_tracker.h"
#include "sync/notifier/mock_invalidation_state_tracker.h"
#include "sync/notifier/mock_sync_notifier_observer.h"
-#include "sync/util/weak_handle.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/sync/notifier/non_blocking_invalidation_notifier.h b/sync/notifier/non_blocking_invalidation_notifier.h
index 31efc74..dfcf63f 100644
--- a/sync/notifier/non_blocking_invalidation_notifier.h
+++ b/sync/notifier/non_blocking_invalidation_notifier.h
@@ -17,10 +17,10 @@
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
#include "jingle/notifier/base/notifier_options.h"
+#include "sync/internal_api/public/util/weak_handle.h"
#include "sync/notifier/invalidation_state_tracker.h"
#include "sync/notifier/sync_notifier.h"
#include "sync/notifier/sync_notifier_observer.h"
-#include "sync/util/weak_handle.h"
namespace base {
class SingleThreadTaskRunner;
diff --git a/sync/notifier/non_blocking_invalidation_notifier_unittest.cc b/sync/notifier/non_blocking_invalidation_notifier_unittest.cc
index 4ac2504..42cc5d1 100644
--- a/sync/notifier/non_blocking_invalidation_notifier_unittest.cc
+++ b/sync/notifier/non_blocking_invalidation_notifier_unittest.cc
@@ -12,9 +12,9 @@
#include "net/url_request/url_request_test_util.h"
#include "sync/internal_api/public/syncable/model_type.h"
#include "sync/internal_api/public/syncable/model_type_payload_map.h"
+#include "sync/internal_api/public/util/weak_handle.h"
#include "sync/notifier/invalidation_state_tracker.h"
#include "sync/notifier/mock_sync_notifier_observer.h"
-#include "sync/util/weak_handle.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/sync/notifier/sync_notifier_factory.h b/sync/notifier/sync_notifier_factory.h
index 9e14fcd..a695ce0 100644
--- a/sync/notifier/sync_notifier_factory.h
+++ b/sync/notifier/sync_notifier_factory.h
@@ -9,8 +9,8 @@
#include "base/memory/weak_ptr.h"
#include "jingle/notifier/base/notifier_options.h"
+#include "sync/internal_api/public/util/weak_handle.h"
#include "sync/notifier/invalidation_state_tracker.h"
-#include "sync/util/weak_handle.h"
namespace sync_notifier {