summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/sync/DEPS4
-rw-r--r--chrome/browser/sync/glue/DEPS17
-rw-r--r--chrome/browser/sync/glue/bridged_sync_notifier.h2
-rw-r--r--chrome/browser/sync/glue/bridged_sync_notifier_unittest.cc4
-rw-r--r--chrome/browser/sync/glue/chrome_sync_notification_bridge.cc2
-rw-r--r--chrome/browser/sync/glue/chrome_sync_notification_bridge_unittest.cc4
-rw-r--r--chrome/browser/sync/glue/sync_backend_host.cc2
-rw-r--r--chrome/browser/sync/glue/sync_backend_host.h2
-rw-r--r--chrome/browser/sync/internal_api/sync_manager.cc10
-rw-r--r--chrome/browser/sync/internal_api/syncapi_unittest.cc6
-rw-r--r--chrome/browser/sync/sync_prefs.h2
-rw-r--r--chrome/browser/sync/test/integration/sync_test.cc2
-rw-r--r--chrome/browser/sync/tools/DEPS7
-rw-r--r--chrome/browser/sync/tools/sync_listen_notifications.cc8
-rw-r--r--chrome/browser/sync/tools/sync_tools.gyp4
-rw-r--r--chrome/chrome.gyp47
-rw-r--r--chrome/chrome_tests.gypi29
-rw-r--r--sync/notifier/DEPS (renamed from chrome/browser/sync/notifier/DEPS)10
-rw-r--r--sync/notifier/cache_invalidation_packet_handler.cc (renamed from chrome/browser/sync/notifier/cache_invalidation_packet_handler.cc)2
-rw-r--r--sync/notifier/cache_invalidation_packet_handler.h (renamed from chrome/browser/sync/notifier/cache_invalidation_packet_handler.h)6
-rw-r--r--sync/notifier/cache_invalidation_packet_handler_unittest.cc (renamed from chrome/browser/sync/notifier/cache_invalidation_packet_handler_unittest.cc)6
-rw-r--r--sync/notifier/chrome_invalidation_client.cc (renamed from chrome/browser/sync/notifier/chrome_invalidation_client.cc)8
-rw-r--r--sync/notifier/chrome_invalidation_client.h (renamed from chrome/browser/sync/notifier/chrome_invalidation_client.h)16
-rw-r--r--sync/notifier/chrome_invalidation_client_unittest.cc (renamed from chrome/browser/sync/notifier/chrome_invalidation_client_unittest.cc)4
-rw-r--r--sync/notifier/chrome_system_resources.cc (renamed from chrome/browser/sync/notifier/chrome_system_resources.cc)6
-rw-r--r--sync/notifier/chrome_system_resources.h (renamed from chrome/browser/sync/notifier/chrome_system_resources.h)8
-rw-r--r--sync/notifier/chrome_system_resources_unittest.cc (renamed from chrome/browser/sync/notifier/chrome_system_resources_unittest.cc)4
-rw-r--r--sync/notifier/invalidation_notifier.cc (renamed from chrome/browser/sync/notifier/invalidation_notifier.cc)5
-rw-r--r--sync/notifier/invalidation_notifier.h (renamed from chrome/browser/sync/notifier/invalidation_notifier.h)14
-rw-r--r--sync/notifier/invalidation_notifier_unittest.cc (renamed from chrome/browser/sync/notifier/invalidation_notifier_unittest.cc)8
-rw-r--r--sync/notifier/invalidation_util.cc (renamed from chrome/browser/sync/notifier/invalidation_util.cc)2
-rw-r--r--sync/notifier/invalidation_util.h (renamed from chrome/browser/sync/notifier/invalidation_util.h)6
-rw-r--r--sync/notifier/invalidation_version_tracker.h (renamed from chrome/browser/sync/notifier/invalidation_version_tracker.h)6
-rw-r--r--sync/notifier/mock_sync_notifier_observer.cc (renamed from chrome/browser/sync/notifier/mock_sync_notifier_observer.cc)4
-rw-r--r--sync/notifier/mock_sync_notifier_observer.h (renamed from chrome/browser/sync/notifier/mock_sync_notifier_observer.h)8
-rw-r--r--sync/notifier/non_blocking_invalidation_notifier.cc (renamed from chrome/browser/sync/notifier/non_blocking_invalidation_notifier.cc)4
-rw-r--r--sync/notifier/non_blocking_invalidation_notifier.h (renamed from chrome/browser/sync/notifier/non_blocking_invalidation_notifier.h)12
-rw-r--r--sync/notifier/non_blocking_invalidation_notifier_unittest.cc (renamed from chrome/browser/sync/notifier/non_blocking_invalidation_notifier_unittest.cc)6
-rw-r--r--sync/notifier/p2p_notifier.cc (renamed from chrome/browser/sync/notifier/p2p_notifier.cc)4
-rw-r--r--sync/notifier/p2p_notifier.h (renamed from chrome/browser/sync/notifier/p2p_notifier.h)8
-rw-r--r--sync/notifier/p2p_notifier_unittest.cc (renamed from chrome/browser/sync/notifier/p2p_notifier_unittest.cc)4
-rw-r--r--sync/notifier/registration_manager.cc (renamed from chrome/browser/sync/notifier/registration_manager.cc)4
-rw-r--r--sync/notifier/registration_manager.h (renamed from chrome/browser/sync/notifier/registration_manager.h)6
-rw-r--r--sync/notifier/registration_manager_unittest.cc (renamed from chrome/browser/sync/notifier/registration_manager_unittest.cc)4
-rw-r--r--sync/notifier/state_writer.h (renamed from chrome/browser/sync/notifier/state_writer.h)8
-rw-r--r--sync/notifier/sync_notifier.h (renamed from chrome/browser/sync/notifier/sync_notifier.h)6
-rw-r--r--sync/notifier/sync_notifier_factory.cc (renamed from chrome/browser/sync/notifier/sync_notifier_factory.cc)8
-rw-r--r--sync/notifier/sync_notifier_factory.h (renamed from chrome/browser/sync/notifier/sync_notifier_factory.h)8
-rw-r--r--sync/notifier/sync_notifier_factory_unittest.cc (renamed from chrome/browser/sync/notifier/sync_notifier_factory_unittest.cc)8
-rw-r--r--sync/notifier/sync_notifier_observer.h (renamed from chrome/browser/sync/notifier/sync_notifier_observer.h)6
-rw-r--r--sync/sync.gyp120
51 files changed, 261 insertions, 230 deletions
diff --git a/chrome/browser/sync/DEPS b/chrome/browser/sync/DEPS
index 6128ec6..847cc5b 100644
--- a/chrome/browser/sync/DEPS
+++ b/chrome/browser/sync/DEPS
@@ -1,12 +1,10 @@
include_rules = [
- # sync_notifier depends on the common jingle notifier classes.
- "+jingle/notifier",
-
# For files not in a subdirectory (what a mess!).
"+sync/js",
"+sync/engine/model_changing_syncer_command.h",
"+sync/engine/model_safe_worker.h",
"+sync/engine/polling_constants.h",
+ "+sync/notifier/invalidation_version_tracker.h",
"+sync/sessions/session_state.h",
"+sync/syncable/model_type.h",
"+sync/syncable/model_type_payload_map.h",
diff --git a/chrome/browser/sync/glue/DEPS b/chrome/browser/sync/glue/DEPS
index 95408b3..dad6f79 100644
--- a/chrome/browser/sync/glue/DEPS
+++ b/chrome/browser/sync/glue/DEPS
@@ -1,19 +1,22 @@
include_rules = [
"-sync/engine",
- "-chrome/browser/sync/notifier",
- "-chrome/browser/sync/sessions",
- "-chrome/browser/sync/syncable",
+ "-sync/sessions",
+ "-sync/syncable",
+
+ "+sync/util",
"+chrome/browser/sync/internal_api",
- "+chrome/browser/sync/util",
+
+ "+jingle/notifier/base",
# Should these live in their own "includes" (e.g) directory(ies)?
# Bug 19878.
"+sync/engine/model_safe_worker.h",
"+sync/engine/passive_model_worker.h",
- "+chrome/browser/sync/notifier/sync_notifier.h",
- "+chrome/browser/sync/notifier/sync_notifier_factory.h",
- "+chrome/browser/sync/notifier/sync_notifier_observer.h",
+ "+sync/notifier/mock_sync_notifier_observer.h",
+ "+sync/notifier/sync_notifier.h",
+ "+sync/notifier/sync_notifier_factory.h",
+ "+sync/notifier/sync_notifier_observer.h",
"+sync/syncable/model_type.h",
"+sync/syncable/model_type_payload_map.h",
"+sync/sessions/session_state.h",
diff --git a/chrome/browser/sync/glue/bridged_sync_notifier.h b/chrome/browser/sync/glue/bridged_sync_notifier.h
index cfa71b1..51404ed 100644
--- a/chrome/browser/sync/glue/bridged_sync_notifier.h
+++ b/chrome/browser/sync/glue/bridged_sync_notifier.h
@@ -7,7 +7,7 @@
#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
-#include "chrome/browser/sync/notifier/sync_notifier.h"
+#include "sync/notifier/sync_notifier.h"
namespace browser_sync {
diff --git a/chrome/browser/sync/glue/bridged_sync_notifier_unittest.cc b/chrome/browser/sync/glue/bridged_sync_notifier_unittest.cc
index 361864e..7adebc1 100644
--- a/chrome/browser/sync/glue/bridged_sync_notifier_unittest.cc
+++ b/chrome/browser/sync/glue/bridged_sync_notifier_unittest.cc
@@ -10,10 +10,10 @@
#include "base/message_loop.h"
#include "base/threading/thread.h"
#include "chrome/browser/sync/glue/chrome_sync_notification_bridge.h"
-#include "chrome/browser/sync/notifier/mock_sync_notifier_observer.h"
-#include "chrome/browser/sync/notifier/sync_notifier.h"
#include "chrome/test/base/profile_mock.h"
#include "content/test/test_browser_thread.h"
+#include "sync/notifier/mock_sync_notifier_observer.h"
+#include "sync/notifier/sync_notifier.h"
#include "sync/syncable/model_type.h"
#include "sync/syncable/model_type_test_util.h"
#include "testing/gmock/include/gmock/gmock.h"
diff --git a/chrome/browser/sync/glue/chrome_sync_notification_bridge.cc b/chrome/browser/sync/glue/chrome_sync_notification_bridge.cc
index 64068dc..a4e2813 100644
--- a/chrome/browser/sync/glue/chrome_sync_notification_bridge.cc
+++ b/chrome/browser/sync/glue/chrome_sync_notification_bridge.cc
@@ -4,10 +4,10 @@
#include "chrome/browser/sync/glue/chrome_sync_notification_bridge.h"
-#include "chrome/browser/sync/notifier/sync_notifier_observer.h"
#include "chrome/common/chrome_notification_types.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/notification_service.h"
+#include "sync/notifier/sync_notifier_observer.h"
using content::BrowserThread;
diff --git a/chrome/browser/sync/glue/chrome_sync_notification_bridge_unittest.cc b/chrome/browser/sync/glue/chrome_sync_notification_bridge_unittest.cc
index 65db317e..0ff1153 100644
--- a/chrome/browser/sync/glue/chrome_sync_notification_bridge_unittest.cc
+++ b/chrome/browser/sync/glue/chrome_sync_notification_bridge_unittest.cc
@@ -10,13 +10,13 @@
#include "base/synchronization/waitable_event.h"
#include "base/test/test_timeouts.h"
#include "base/threading/thread.h"
-#include "chrome/browser/sync/notifier/mock_sync_notifier_observer.h"
-#include "chrome/browser/sync/notifier/sync_notifier_observer.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/test/base/profile_mock.h"
#include "content/public/browser/notification_details.h"
#include "content/public/browser/notification_service.h"
#include "content/test/test_browser_thread.h"
+#include "sync/notifier/mock_sync_notifier_observer.h"
+#include "sync/notifier/sync_notifier_observer.h"
#include "sync/syncable/model_type.h"
#include "sync/syncable/model_type_payload_map.h"
#include "testing/gmock/include/gmock/gmock.h"
diff --git a/chrome/browser/sync/glue/sync_backend_host.cc b/chrome/browser/sync/glue/sync_backend_host.cc
index 0ade4f08..97aaa31 100644
--- a/chrome/browser/sync/glue/sync_backend_host.cc
+++ b/chrome/browser/sync/glue/sync_backend_host.cc
@@ -29,7 +29,6 @@
#include "chrome/browser/sync/glue/sync_backend_registrar.h"
#include "chrome/browser/sync/internal_api/base_transaction.h"
#include "chrome/browser/sync/internal_api/read_transaction.h"
-#include "chrome/browser/sync/notifier/sync_notifier.h"
#include "chrome/browser/sync/sync_prefs.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/chrome_switches.h"
@@ -43,6 +42,7 @@
#include "net/base/host_port_pair.h"
#include "net/url_request/url_request_context_getter.h"
#include "sync/engine/model_safe_worker.h"
+#include "sync/notifier/sync_notifier.h"
#include "sync/protocol/encryption.pb.h"
#include "sync/protocol/sync.pb.h"
#include "sync/sessions/session_state.h"
diff --git a/chrome/browser/sync/glue/sync_backend_host.h b/chrome/browser/sync/glue/sync_backend_host.h
index 42301510..d809230 100644
--- a/chrome/browser/sync/glue/sync_backend_host.h
+++ b/chrome/browser/sync/glue/sync_backend_host.h
@@ -20,10 +20,10 @@
#include "chrome/browser/sync/glue/chrome_sync_notification_bridge.h"
#include "chrome/browser/sync/internal_api/configure_reason.h"
#include "chrome/browser/sync/internal_api/sync_manager.h"
-#include "chrome/browser/sync/notifier/sync_notifier_factory.h"
#include "chrome/common/net/gaia/google_service_auth_error.h"
#include "googleurl/src/gurl.h"
#include "sync/engine/model_safe_worker.h"
+#include "sync/notifier/sync_notifier_factory.h"
#include "sync/protocol/encryption.pb.h"
#include "sync/protocol/sync_protocol_error.h"
#include "sync/syncable/model_type.h"
diff --git a/chrome/browser/sync/internal_api/sync_manager.cc b/chrome/browser/sync/internal_api/sync_manager.cc
index 74a6ca8..ba62edd 100644
--- a/chrome/browser/sync/internal_api/sync_manager.cc
+++ b/chrome/browser/sync/internal_api/sync_manager.cc
@@ -18,21 +18,19 @@
#include "base/string_number_conversions.h"
#include "base/values.h"
#include "chrome/browser/sync/internal_api/all_status.h"
-#include "chrome/browser/sync/internal_api/syncapi_internal.h"
#include "chrome/browser/sync/internal_api/base_node.h"
#include "chrome/browser/sync/internal_api/change_reorder_buffer.h"
#include "chrome/browser/sync/internal_api/configure_reason.h"
#include "chrome/browser/sync/internal_api/debug_info_event_listener.h"
+#include "chrome/browser/sync/internal_api/js_mutation_event_observer.h"
+#include "chrome/browser/sync/internal_api/js_sync_manager_observer.h"
#include "chrome/browser/sync/internal_api/read_node.h"
#include "chrome/browser/sync/internal_api/read_transaction.h"
+#include "chrome/browser/sync/internal_api/syncapi_internal.h"
#include "chrome/browser/sync/internal_api/syncapi_server_connection_manager.h"
#include "chrome/browser/sync/internal_api/user_share.h"
#include "chrome/browser/sync/internal_api/write_node.h"
#include "chrome/browser/sync/internal_api/write_transaction.h"
-#include "chrome/browser/sync/internal_api/js_mutation_event_observer.h"
-#include "chrome/browser/sync/internal_api/js_sync_manager_observer.h"
-#include "chrome/browser/sync/notifier/sync_notifier.h"
-#include "chrome/browser/sync/notifier/sync_notifier_observer.h"
#include "net/base/network_change_notifier.h"
#include "sync/engine/net/server_connection_manager.h"
#include "sync/engine/nigori_util.h"
@@ -44,6 +42,8 @@
#include "sync/js/js_event_details.h"
#include "sync/js/js_event_handler.h"
#include "sync/js/js_reply_handler.h"
+#include "sync/notifier/sync_notifier.h"
+#include "sync/notifier/sync_notifier_observer.h"
#include "sync/protocol/encryption.pb.h"
#include "sync/protocol/proto_value_conversions.h"
#include "sync/protocol/sync.pb.h"
diff --git a/chrome/browser/sync/internal_api/syncapi_unittest.cc b/chrome/browser/sync/internal_api/syncapi_unittest.cc
index 1a4ab28..8ebf0b4 100644
--- a/chrome/browser/sync/internal_api/syncapi_unittest.cc
+++ b/chrome/browser/sync/internal_api/syncapi_unittest.cc
@@ -23,17 +23,15 @@
#include "base/test/values_test_util.h"
#include "base/utf_string_conversions.h"
#include "base/values.h"
-#include "chrome/browser/sync/internal_api/syncapi_internal.h"
#include "chrome/browser/sync/internal_api/change_record.h"
#include "chrome/browser/sync/internal_api/http_post_provider_factory.h"
#include "chrome/browser/sync/internal_api/http_post_provider_interface.h"
#include "chrome/browser/sync/internal_api/read_node.h"
#include "chrome/browser/sync/internal_api/read_transaction.h"
#include "chrome/browser/sync/internal_api/sync_manager.h"
+#include "chrome/browser/sync/internal_api/syncapi_internal.h"
#include "chrome/browser/sync/internal_api/write_node.h"
#include "chrome/browser/sync/internal_api/write_transaction.h"
-#include "chrome/browser/sync/notifier/sync_notifier.h"
-#include "chrome/browser/sync/notifier/sync_notifier_observer.h"
#include "chrome/browser/sync/test/engine/test_user_share.h"
#include "sync/engine/model_safe_worker.h"
#include "sync/engine/nigori_util.h"
@@ -43,6 +41,8 @@
#include "sync/js/js_event_handler.h"
#include "sync/js/js_reply_handler.h"
#include "sync/js/js_test_util.h"
+#include "sync/notifier/sync_notifier.h"
+#include "sync/notifier/sync_notifier_observer.h"
#include "sync/protocol/bookmark_specifics.pb.h"
#include "sync/protocol/encryption.pb.h"
#include "sync/protocol/extension_specifics.pb.h"
diff --git a/chrome/browser/sync/sync_prefs.h b/chrome/browser/sync/sync_prefs.h
index 3256ca8..b0c7014 100644
--- a/chrome/browser/sync/sync_prefs.h
+++ b/chrome/browser/sync/sync_prefs.h
@@ -13,8 +13,8 @@
#include "base/threading/non_thread_safe.h"
#include "base/time.h"
#include "chrome/browser/prefs/pref_member.h"
-#include "chrome/browser/sync/notifier/invalidation_version_tracker.h"
#include "content/public/browser/notification_observer.h"
+#include "sync/notifier/invalidation_version_tracker.h"
#include "sync/syncable/model_type.h"
class PrefService;
diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc
index c25c438..e8d8595 100644
--- a/chrome/browser/sync/test/integration/sync_test.cc
+++ b/chrome/browser/sync/test/integration/sync_test.cc
@@ -23,7 +23,6 @@
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/search_engines/template_url_service.h"
#include "chrome/browser/search_engines/template_url_service_factory.h"
-#include "chrome/browser/sync/notifier/p2p_notifier.h"
#include "chrome/browser/sync/profile_sync_service_factory.h"
#include "chrome/browser/sync/profile_sync_service_harness.h"
#include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
@@ -50,6 +49,7 @@
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_context_getter.h"
#include "net/url_request/url_request_status.h"
+#include "sync/notifier/p2p_notifier.h"
#include "sync/protocol/sync.pb.h"
using content::BrowserThread;
diff --git a/chrome/browser/sync/tools/DEPS b/chrome/browser/sync/tools/DEPS
index 877f421..c5196b79 100644
--- a/chrome/browser/sync/tools/DEPS
+++ b/chrome/browser/sync/tools/DEPS
@@ -1,7 +1,4 @@
include_rules = [
- # sync_tools depends on the google cache invalidation API.
- "+google/cacheinvalidation",
- # sync_tools depends on libjingle.
- "+talk/base",
- "+talk/xmpp",
+ "+jingle/notifier/base",
+ "+sync/notifier",
]
diff --git a/chrome/browser/sync/tools/sync_listen_notifications.cc b/chrome/browser/sync/tools/sync_listen_notifications.cc
index 5d825b5..7b38c0c 100644
--- a/chrome/browser/sync/tools/sync_listen_notifications.cc
+++ b/chrome/browser/sync/tools/sync_listen_notifications.cc
@@ -15,14 +15,14 @@
#include "base/memory/weak_ptr.h"
#include "base/message_loop.h"
#include "base/threading/thread.h"
-#include "chrome/browser/sync/notifier/invalidation_version_tracker.h"
-#include "chrome/browser/sync/notifier/sync_notifier.h"
-#include "chrome/browser/sync/notifier/sync_notifier_factory.h"
-#include "chrome/browser/sync/notifier/sync_notifier_observer.h"
#include "jingle/notifier/base/notification_method.h"
#include "jingle/notifier/base/notifier_options.h"
#include "net/base/host_port_pair.h"
#include "net/url_request/url_request_test_util.h"
+#include "sync/notifier/invalidation_version_tracker.h"
+#include "sync/notifier/sync_notifier.h"
+#include "sync/notifier/sync_notifier_factory.h"
+#include "sync/notifier/sync_notifier_observer.h"
#include "sync/syncable/model_type.h"
#include "sync/syncable/model_type_payload_map.h"
diff --git a/chrome/browser/sync/tools/sync_tools.gyp b/chrome/browser/sync/tools/sync_tools.gyp
index 988f006..a9110f7 100644
--- a/chrome/browser/sync/tools/sync_tools.gyp
+++ b/chrome/browser/sync/tools/sync_tools.gyp
@@ -1,4 +1,4 @@
-# Copyright (c) 2010 The Chromium Authors. All rights reserved.
+# Copyright (c) 2012 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.
@@ -12,9 +12,9 @@
],
'dependencies': [
'<(DEPTH)/base/base.gyp:base',
- '<(DEPTH)/chrome/chrome.gyp:sync_notifier',
'<(DEPTH)/net/net.gyp:net',
'<(DEPTH)/net/net.gyp:net_test_support',
+ '<(DEPTH)/sync/sync.gyp:sync_notifier',
],
},
],
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index eebc623..9ca594e 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -318,8 +318,8 @@
'../net/net.gyp:net',
'../third_party/sqlite/sqlite.gyp:sqlite',
'../sync/protocol/sync_proto.gyp:sync_proto',
+ '../sync/sync.gyp:sync_notifier',
'../sync/sync.gyp:sync',
- 'sync_notifier',
],
'export_dependent_settings': [
'../sync/protocol/sync_proto.gyp:sync_proto',
@@ -364,51 +364,6 @@
# including the generated proto header files from this target's
# header files.
},
- # A library for sending and receiving server-issued notifications.
- {
- 'target_name': 'sync_notifier',
- 'type': 'static_library',
- 'variables': { 'enable_wexit_time_destructors': 1, },
- 'sources': [
- 'browser/sync/notifier/cache_invalidation_packet_handler.cc',
- 'browser/sync/notifier/cache_invalidation_packet_handler.h',
- 'browser/sync/notifier/chrome_invalidation_client.cc',
- 'browser/sync/notifier/chrome_invalidation_client.h',
- 'browser/sync/notifier/chrome_system_resources.cc',
- 'browser/sync/notifier/chrome_system_resources.h',
- 'browser/sync/notifier/invalidation_notifier.h',
- 'browser/sync/notifier/invalidation_notifier.cc',
- 'browser/sync/notifier/invalidation_util.cc',
- 'browser/sync/notifier/invalidation_util.h',
- 'browser/sync/notifier/invalidation_version_tracker.h',
- 'browser/sync/notifier/non_blocking_invalidation_notifier.h',
- 'browser/sync/notifier/non_blocking_invalidation_notifier.cc',
- 'browser/sync/notifier/p2p_notifier.h',
- 'browser/sync/notifier/p2p_notifier.cc',
- 'browser/sync/notifier/registration_manager.cc',
- 'browser/sync/notifier/registration_manager.h',
- 'browser/sync/notifier/state_writer.h',
- 'browser/sync/notifier/sync_notifier.h',
- 'browser/sync/notifier/sync_notifier_factory.h',
- 'browser/sync/notifier/sync_notifier_factory.cc',
- ],
- 'include_dirs': [
- '..',
- ],
- 'dependencies': [
- '../sync/sync.gyp:sync',
- '../jingle/jingle.gyp:notifier',
- '../net/net.gyp:net',
- '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
- ],
- # This target exports a hard dependency because it depends on
- # cacheinvalidation (which itself has hard_dependency set).
- 'hard_dependency': 1,
- 'export_dependent_settings': [
- '../jingle/jingle.gyp:notifier',
- '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
- ],
- },
{
'target_name': 'service',
'type': 'static_library',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 6285273..35adc5f 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -396,21 +396,6 @@
],
},
{
- 'target_name': 'test_support_sync_notifier',
- 'type': 'static_library',
- 'dependencies': [
- '../testing/gmock.gyp:gmock',
- 'sync_notifier',
- ],
- 'include_dirs': [
- '..',
- ],
- 'sources': [
- 'browser/sync/notifier/mock_sync_notifier_observer.cc',
- 'browser/sync/notifier/mock_sync_notifier_observer.h',
- ],
- },
- {
'target_name': 'test_support_unit',
'type': 'static_library',
'dependencies': [
@@ -1138,9 +1123,9 @@
'../testing/gtest.gyp:gtest',
'test_support_common',
'../sync/sync.gyp:test_support_sync',
+ '../sync/sync.gyp:test_support_sync_notifier',
'test_support_syncapi',
'test_support_syncapi_service',
- 'test_support_sync_notifier',
'test_support_unit',
# 3) anything tests directly depend on
'../skia/skia.gyp:skia',
@@ -3843,14 +3828,6 @@
'browser/sync/internal_api/syncapi_unittest.cc',
'browser/sync/internal_api/js_mutation_event_observer_unittest.cc',
'browser/sync/internal_api/js_sync_manager_observer_unittest.cc',
- 'browser/sync/notifier/cache_invalidation_packet_handler_unittest.cc',
- 'browser/sync/notifier/chrome_invalidation_client_unittest.cc',
- 'browser/sync/notifier/chrome_system_resources_unittest.cc',
- 'browser/sync/notifier/invalidation_notifier_unittest.cc',
- 'browser/sync/notifier/non_blocking_invalidation_notifier_unittest.cc',
- 'browser/sync/notifier/p2p_notifier_unittest.cc',
- 'browser/sync/notifier/registration_manager_unittest.cc',
- 'browser/sync/notifier/sync_notifier_factory_unittest.cc',
],
'include_dirs': [
'..',
@@ -3858,17 +3835,15 @@
'dependencies': [
'../base/base.gyp:run_all_unittests',
'../base/base.gyp:test_support_base',
- '../jingle/jingle.gyp:notifier_test_util',
'../net/net.gyp:net',
'../net/net.gyp:net_test_support',
+ '../sync/sync.gyp:sync_notifier_tests',
'../sync/sync.gyp:sync_tests',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'syncapi_core',
- 'sync_notifier',
'test_support_syncapi',
'test_support_syncapi_service',
- 'test_support_sync_notifier',
],
# TODO(akalin): This is needed because histogram.cc uses
diff --git a/chrome/browser/sync/notifier/DEPS b/sync/notifier/DEPS
index f856e1e..ab55b47 100644
--- a/chrome/browser/sync/notifier/DEPS
+++ b/sync/notifier/DEPS
@@ -1,15 +1,11 @@
include_rules = [
- "-chrome",
-
- "+chrome/browser/sync/notifier",
-
- "+chrome/common/chrome_switches.h",
"+google/cacheinvalidation",
"+jingle/notifier",
+ "+net/url_request/url_request_context.h",
+ "+net/url_request/url_request_test_util.h",
"+sync/syncable/model_type.h",
"+sync/syncable/model_type_payload_map.h",
- "+sync/syncable/model_type_test_util.h",
"+sync/protocol/service_constants.h",
"+sync/util",
@@ -17,6 +13,4 @@ include_rules = [
"+talk/base",
# sync_notifier depends on the xmpp part of libjingle.
"+talk/xmpp",
-
- "-chrome/browser/sync/internal_api",
]
diff --git a/chrome/browser/sync/notifier/cache_invalidation_packet_handler.cc b/sync/notifier/cache_invalidation_packet_handler.cc
index 1b1769b..5d68753 100644
--- a/chrome/browser/sync/notifier/cache_invalidation_packet_handler.cc
+++ b/sync/notifier/cache_invalidation_packet_handler.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/sync/notifier/cache_invalidation_packet_handler.h"
+#include "sync/notifier/cache_invalidation_packet_handler.h"
#include <string>
diff --git a/chrome/browser/sync/notifier/cache_invalidation_packet_handler.h b/sync/notifier/cache_invalidation_packet_handler.h
index dfd8b81..655933d 100644
--- a/chrome/browser/sync/notifier/cache_invalidation_packet_handler.h
+++ b/sync/notifier/cache_invalidation_packet_handler.h
@@ -5,8 +5,8 @@
// Class that handles the details of sending and receiving client
// invalidation packets.
-#ifndef CHROME_BROWSER_SYNC_NOTIFIER_CACHE_INVALIDATION_PACKET_HANDLER_H_
-#define CHROME_BROWSER_SYNC_NOTIFIER_CACHE_INVALIDATION_PACKET_HANDLER_H_
+#ifndef SYNC_NOTIFIER_CACHE_INVALIDATION_PACKET_HANDLER_H_
+#define SYNC_NOTIFIER_CACHE_INVALIDATION_PACKET_HANDLER_H_
#pragma once
#include <string>
@@ -83,4 +83,4 @@ class CacheInvalidationPacketHandler
} // namespace sync_notifier
-#endif // CHROME_BROWSER_SYNC_NOTIFIER_CACHE_INVALIDATION_PACKET_HANDLER_H_
+#endif // SYNC_NOTIFIER_CACHE_INVALIDATION_PACKET_HANDLER_H_
diff --git a/chrome/browser/sync/notifier/cache_invalidation_packet_handler_unittest.cc b/sync/notifier/cache_invalidation_packet_handler_unittest.cc
index e577e69..184c030 100644
--- a/chrome/browser/sync/notifier/cache_invalidation_packet_handler_unittest.cc
+++ b/sync/notifier/cache_invalidation_packet_handler_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/sync/notifier/cache_invalidation_packet_handler.h"
+#include "sync/notifier/cache_invalidation_packet_handler.h"
#include "base/base64.h"
#include "base/memory/weak_ptr.h"
@@ -14,14 +14,10 @@
#include "jingle/notifier/listener/notification_defines.h"
#include "talk/base/task.h"
#include "talk/xmpp/asyncsocket.h"
-#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace sync_notifier {
-using ::testing::_;
-using ::testing::Return;
-
class MockMessageCallback {
public:
void StoreMessage(const std::string& message) {
diff --git a/chrome/browser/sync/notifier/chrome_invalidation_client.cc b/sync/notifier/chrome_invalidation_client.cc
index b4b499b..d74cf0a 100644
--- a/chrome/browser/sync/notifier/chrome_invalidation_client.cc
+++ b/sync/notifier/chrome_invalidation_client.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/sync/notifier/chrome_invalidation_client.h"
+#include "sync/notifier/chrome_invalidation_client.h"
#include <string>
#include <vector>
@@ -10,13 +10,13 @@
#include "base/compiler_specific.h"
#include "base/logging.h"
#include "base/tracked_objects.h"
-#include "chrome/browser/sync/notifier/cache_invalidation_packet_handler.h"
-#include "chrome/browser/sync/notifier/invalidation_util.h"
-#include "chrome/browser/sync/notifier/registration_manager.h"
#include "google/cacheinvalidation/include/invalidation-client-factory.h"
#include "google/cacheinvalidation/include/invalidation-client.h"
#include "google/cacheinvalidation/include/types.h"
#include "google/cacheinvalidation/v2/types.pb.h"
+#include "sync/notifier/cache_invalidation_packet_handler.h"
+#include "sync/notifier/invalidation_util.h"
+#include "sync/notifier/registration_manager.h"
#include "sync/syncable/model_type.h"
namespace {
diff --git a/chrome/browser/sync/notifier/chrome_invalidation_client.h b/sync/notifier/chrome_invalidation_client.h
index 3d103b0..b1c8438 100644
--- a/chrome/browser/sync/notifier/chrome_invalidation_client.h
+++ b/sync/notifier/chrome_invalidation_client.h
@@ -5,8 +5,8 @@
// A simple wrapper around invalidation::InvalidationClient that
// handles all the startup/shutdown details and hookups.
-#ifndef CHROME_BROWSER_SYNC_NOTIFIER_CHROME_INVALIDATION_CLIENT_H_
-#define CHROME_BROWSER_SYNC_NOTIFIER_CHROME_INVALIDATION_CLIENT_H_
+#ifndef SYNC_NOTIFIER_CHROME_INVALIDATION_CLIENT_H_
+#define SYNC_NOTIFIER_CHROME_INVALIDATION_CLIENT_H_
#pragma once
#include <string>
@@ -16,18 +16,14 @@
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/threading/non_thread_safe.h"
-#include "chrome/browser/sync/notifier/chrome_system_resources.h"
-#include "chrome/browser/sync/notifier/invalidation_version_tracker.h"
-#include "chrome/browser/sync/notifier/state_writer.h"
#include "google/cacheinvalidation/include/invalidation-listener.h"
+#include "sync/notifier/chrome_system_resources.h"
+#include "sync/notifier/invalidation_version_tracker.h"
+#include "sync/notifier/state_writer.h"
#include "sync/syncable/model_type.h"
#include "sync/syncable/model_type_payload_map.h"
#include "sync/util/weak_handle.h"
-// TODO(akalin): Move invalidation::InvalidationListener into its own
-// file and include that instead of invalidation-client.h (which
-// includes generated protobuf header files).
-
namespace buzz {
class XmppTaskParentInterface;
} // namespace buzz
@@ -143,4 +139,4 @@ class ChromeInvalidationClient
} // namespace sync_notifier
-#endif // CHROME_BROWSER_SYNC_NOTIFIER_CHROME_INVALIDATION_CLIENT_H_
+#endif // SYNC_NOTIFIER_CHROME_INVALIDATION_CLIENT_H_
diff --git a/chrome/browser/sync/notifier/chrome_invalidation_client_unittest.cc b/sync/notifier/chrome_invalidation_client_unittest.cc
index c12dc99..72d71da 100644
--- a/chrome/browser/sync/notifier/chrome_invalidation_client_unittest.cc
+++ b/sync/notifier/chrome_invalidation_client_unittest.cc
@@ -5,12 +5,12 @@
#include <string>
#include "base/message_loop.h"
-#include "chrome/browser/sync/notifier/chrome_invalidation_client.h"
-#include "chrome/browser/sync/notifier/state_writer.h"
#include "google/cacheinvalidation/include/invalidation-client.h"
#include "google/cacheinvalidation/include/types.h"
#include "google/cacheinvalidation/v2/types.pb.h"
#include "jingle/notifier/base/fake_base_task.h"
+#include "sync/notifier/chrome_invalidation_client.h"
+#include "sync/notifier/state_writer.h"
#include "sync/syncable/model_type.h"
#include "sync/syncable/model_type_payload_map.h"
#include "sync/util/weak_handle.h"
diff --git a/chrome/browser/sync/notifier/chrome_system_resources.cc b/sync/notifier/chrome_system_resources.cc
index 927a633..498f5fd 100644
--- a/chrome/browser/sync/notifier/chrome_system_resources.cc
+++ b/sync/notifier/chrome_system_resources.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/sync/notifier/chrome_system_resources.h"
+#include "sync/notifier/chrome_system_resources.h"
#include <cstdlib>
#include <cstring>
@@ -14,9 +14,9 @@
#include "base/stl_util.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
-#include "chrome/browser/sync/notifier/cache_invalidation_packet_handler.h"
-#include "chrome/browser/sync/notifier/invalidation_util.h"
#include "google/cacheinvalidation/include/types.h"
+#include "sync/notifier/cache_invalidation_packet_handler.h"
+#include "sync/notifier/invalidation_util.h"
namespace sync_notifier {
diff --git a/chrome/browser/sync/notifier/chrome_system_resources.h b/sync/notifier/chrome_system_resources.h
index 5536463..032e050 100644
--- a/chrome/browser/sync/notifier/chrome_system_resources.h
+++ b/sync/notifier/chrome_system_resources.h
@@ -6,8 +6,8 @@
// for scheduling. Assumes the current message loop is already
// running.
-#ifndef CHROME_BROWSER_SYNC_NOTIFIER_CHROME_SYSTEM_RESOURCES_H_
-#define CHROME_BROWSER_SYNC_NOTIFIER_CHROME_SYSTEM_RESOURCES_H_
+#ifndef SYNC_NOTIFIER_CHROME_SYSTEM_RESOURCES_H_
+#define SYNC_NOTIFIER_CHROME_SYSTEM_RESOURCES_H_
#pragma once
#include <set>
@@ -19,8 +19,8 @@
#include "base/memory/weak_ptr.h"
#include "base/message_loop.h"
#include "base/threading/non_thread_safe.h"
-#include "chrome/browser/sync/notifier/state_writer.h"
#include "google/cacheinvalidation/include/system-resources.h"
+#include "sync/notifier/state_writer.h"
namespace sync_notifier {
@@ -173,4 +173,4 @@ class ChromeSystemResources : public invalidation::SystemResources {
} // namespace sync_notifier
-#endif // CHROME_BROWSER_SYNC_NOTIFIER_CHROME_SYSTEM_RESOURCES_H_
+#endif // SYNC_NOTIFIER_CHROME_SYSTEM_RESOURCES_H_
diff --git a/chrome/browser/sync/notifier/chrome_system_resources_unittest.cc b/sync/notifier/chrome_system_resources_unittest.cc
index 7d819d0..a61497f 100644
--- a/chrome/browser/sync/notifier/chrome_system_resources_unittest.cc
+++ b/sync/notifier/chrome_system_resources_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/sync/notifier/chrome_system_resources.h"
+#include "sync/notifier/chrome_system_resources.h"
#include <string>
@@ -11,8 +11,8 @@
#include "base/callback.h"
#include "base/message_loop.h"
-#include "chrome/browser/sync/notifier/state_writer.h"
#include "google/cacheinvalidation/include/types.h"
+#include "sync/notifier/state_writer.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/sync/notifier/invalidation_notifier.cc b/sync/notifier/invalidation_notifier.cc
index ea2560d..f9ab44d 100644
--- a/chrome/browser/sync/notifier/invalidation_notifier.cc
+++ b/sync/notifier/invalidation_notifier.cc
@@ -2,16 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/sync/notifier/invalidation_notifier.h"
+#include "sync/notifier/invalidation_notifier.h"
#include "base/logging.h"
#include "base/message_loop_proxy.h"
-#include "chrome/browser/sync/notifier/sync_notifier_observer.h"
#include "jingle/notifier/base/const_communicator.h"
#include "jingle/notifier/base/notifier_options_util.h"
#include "jingle/notifier/communicator/connection_options.h"
-#include "net/base/host_port_pair.h"
#include "net/url_request/url_request_context.h"
+#include "sync/notifier/sync_notifier_observer.h"
#include "sync/protocol/service_constants.h"
#include "sync/syncable/model_type_payload_map.h"
#include "talk/xmpp/jid.h"
diff --git a/chrome/browser/sync/notifier/invalidation_notifier.h b/sync/notifier/invalidation_notifier.h
index ee5e4b1..385fbfc 100644
--- a/chrome/browser/sync/notifier/invalidation_notifier.h
+++ b/sync/notifier/invalidation_notifier.h
@@ -9,8 +9,8 @@
// You probably don't want to use this directly; use
// NonBlockingInvalidationNotifier.
-#ifndef CHROME_BROWSER_SYNC_NOTIFIER_INVALIDATION_NOTIFIER_H_
-#define CHROME_BROWSER_SYNC_NOTIFIER_INVALIDATION_NOTIFIER_H_
+#ifndef SYNC_NOTIFIER_INVALIDATION_NOTIFIER_H_
+#define SYNC_NOTIFIER_INVALIDATION_NOTIFIER_H_
#pragma once
#include <string>
@@ -20,12 +20,12 @@
#include "base/memory/scoped_ptr.h"
#include "base/observer_list.h"
#include "base/threading/non_thread_safe.h"
-#include "chrome/browser/sync/notifier/chrome_invalidation_client.h"
-#include "chrome/browser/sync/notifier/invalidation_version_tracker.h"
-#include "chrome/browser/sync/notifier/state_writer.h"
-#include "chrome/browser/sync/notifier/sync_notifier.h"
#include "jingle/notifier/base/notifier_options.h"
#include "jingle/notifier/communicator/login.h"
+#include "sync/notifier/chrome_invalidation_client.h"
+#include "sync/notifier/invalidation_version_tracker.h"
+#include "sync/notifier/state_writer.h"
+#include "sync/notifier/sync_notifier.h"
#include "sync/syncable/model_type.h"
#include "sync/util/weak_handle.h"
@@ -120,4 +120,4 @@ class InvalidationNotifier
} // namespace sync_notifier
-#endif // CHROME_BROWSER_SYNC_NOTIFIER_INVALIDATION_NOTIFIER_H_
+#endif // SYNC_NOTIFIER_INVALIDATION_NOTIFIER_H_
diff --git a/chrome/browser/sync/notifier/invalidation_notifier_unittest.cc b/sync/notifier/invalidation_notifier_unittest.cc
index f29cb59..701e133 100644
--- a/chrome/browser/sync/notifier/invalidation_notifier_unittest.cc
+++ b/sync/notifier/invalidation_notifier_unittest.cc
@@ -2,17 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/sync/notifier/invalidation_notifier.h"
+#include "sync/notifier/invalidation_notifier.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
-#include "chrome/browser/sync/notifier/invalidation_version_tracker.h"
-#include "chrome/browser/sync/notifier/mock_sync_notifier_observer.h"
#include "jingle/notifier/base/fake_base_task.h"
#include "jingle/notifier/base/notifier_options.h"
-#include "net/base/cert_verifier.h"
-#include "net/base/host_resolver.h"
#include "net/url_request/url_request_test_util.h"
+#include "sync/notifier/invalidation_version_tracker.h"
+#include "sync/notifier/mock_sync_notifier_observer.h"
#include "sync/syncable/model_type.h"
#include "sync/syncable/model_type_payload_map.h"
#include "sync/util/weak_handle.h"
diff --git a/chrome/browser/sync/notifier/invalidation_util.cc b/sync/notifier/invalidation_util.cc
index 706c666..126e56f 100644
--- a/chrome/browser/sync/notifier/invalidation_util.cc
+++ b/sync/notifier/invalidation_util.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/sync/notifier/invalidation_util.h"
+#include "sync/notifier/invalidation_util.h"
#include <sstream>
diff --git a/chrome/browser/sync/notifier/invalidation_util.h b/sync/notifier/invalidation_util.h
index 7a14586..80c032d 100644
--- a/chrome/browser/sync/notifier/invalidation_util.h
+++ b/sync/notifier/invalidation_util.h
@@ -4,8 +4,8 @@
//
// Various utilities for dealing with invalidation data types.
-#ifndef CHROME_BROWSER_SYNC_NOTIFIER_INVALIDATION_UTIL_H_
-#define CHROME_BROWSER_SYNC_NOTIFIER_INVALIDATION_UTIL_H_
+#ifndef SYNC_NOTIFIER_INVALIDATION_UTIL_H_
+#define SYNC_NOTIFIER_INVALIDATION_UTIL_H_
#pragma once
#include <string>
@@ -37,4 +37,4 @@ std::string InvalidationToString(
} // namespace sync_notifier
-#endif // CHROME_BROWSER_SYNC_NOTIFIER_INVALIDATION_UTIL_H_
+#endif // SYNC_NOTIFIER_INVALIDATION_UTIL_H_
diff --git a/chrome/browser/sync/notifier/invalidation_version_tracker.h b/sync/notifier/invalidation_version_tracker.h
index 17d89f3..70eda6b 100644
--- a/chrome/browser/sync/notifier/invalidation_version_tracker.h
+++ b/sync/notifier/invalidation_version_tracker.h
@@ -5,8 +5,8 @@
// An InvalidationVersionTracker is an interface that handles getting
// and setting (persisting) max invalidation versions.
-#ifndef CHROME_BROWSER_SYNC_NOTIFIER_INVALIDATION_VERSION_TRACKER_H_
-#define CHROME_BROWSER_SYNC_NOTIFIER_INVALIDATION_VERSION_TRACKER_H_
+#ifndef SYNC_NOTIFIER_INVALIDATION_VERSION_TRACKER_H_
+#define SYNC_NOTIFIER_INVALIDATION_VERSION_TRACKER_H_
#include <map>
@@ -34,5 +34,5 @@ class InvalidationVersionTracker {
} // namespace sync_notifier
-#endif // CHROME_BROWSER_SYNC_NOTIFIER_INVALIDATION_VERSION_TRACKER_H_
+#endif // SYNC_NOTIFIER_INVALIDATION_VERSION_TRACKER_H_
diff --git a/chrome/browser/sync/notifier/mock_sync_notifier_observer.cc b/sync/notifier/mock_sync_notifier_observer.cc
index b46ac68..51c0135 100644
--- a/chrome/browser/sync/notifier/mock_sync_notifier_observer.cc
+++ b/sync/notifier/mock_sync_notifier_observer.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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/sync/notifier/mock_sync_notifier_observer.h"
+#include "sync/notifier/mock_sync_notifier_observer.h"
namespace sync_notifier {
diff --git a/chrome/browser/sync/notifier/mock_sync_notifier_observer.h b/sync/notifier/mock_sync_notifier_observer.h
index 8c53329..7d648df 100644
--- a/chrome/browser/sync/notifier/mock_sync_notifier_observer.h
+++ b/sync/notifier/mock_sync_notifier_observer.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_SYNC_NOTIFIER_MOCK_SYNC_NOTIFIER_OBSERVER_H_
-#define CHROME_BROWSER_SYNC_NOTIFIER_MOCK_SYNC_NOTIFIER_OBSERVER_H_
+#ifndef SYNC_NOTIFIER_MOCK_SYNC_NOTIFIER_OBSERVER_H_
+#define SYNC_NOTIFIER_MOCK_SYNC_NOTIFIER_OBSERVER_H_
#pragma once
#include <string>
-#include "chrome/browser/sync/notifier/sync_notifier_observer.h"
+#include "sync/notifier/sync_notifier_observer.h"
#include "testing/gmock/include/gmock/gmock.h"
namespace sync_notifier {
@@ -27,4 +27,4 @@ class MockSyncNotifierObserver : public SyncNotifierObserver {
} // namespace sync_notifier
-#endif // CHROME_BROWSER_SYNC_NOTIFIER_MOCK_SYNC_NOTIFIER_OBSERVER_H_
+#endif // SYNC_NOTIFIER_MOCK_SYNC_NOTIFIER_OBSERVER_H_
diff --git a/chrome/browser/sync/notifier/non_blocking_invalidation_notifier.cc b/sync/notifier/non_blocking_invalidation_notifier.cc
index 0f441a4..01af7d9 100644
--- a/chrome/browser/sync/notifier/non_blocking_invalidation_notifier.cc
+++ b/sync/notifier/non_blocking_invalidation_notifier.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/sync/notifier/non_blocking_invalidation_notifier.h"
+#include "sync/notifier/non_blocking_invalidation_notifier.h"
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
#include "base/threading/thread.h"
-#include "chrome/browser/sync/notifier/invalidation_notifier.h"
+#include "sync/notifier/invalidation_notifier.h"
namespace sync_notifier {
diff --git a/chrome/browser/sync/notifier/non_blocking_invalidation_notifier.h b/sync/notifier/non_blocking_invalidation_notifier.h
index c260dc0..9432936 100644
--- a/chrome/browser/sync/notifier/non_blocking_invalidation_notifier.h
+++ b/sync/notifier/non_blocking_invalidation_notifier.h
@@ -5,8 +5,8 @@
// An implementation of SyncNotifier that wraps InvalidationNotifier
// on its own thread.
-#ifndef CHROME_BROWSER_SYNC_NOTIFIER_NON_BLOCKING_INVALIDATION_NOTIFIER_H_
-#define CHROME_BROWSER_SYNC_NOTIFIER_NON_BLOCKING_INVALIDATION_NOTIFIER_H_
+#ifndef SYNC_NOTIFIER_NON_BLOCKING_INVALIDATION_NOTIFIER_H_
+#define SYNC_NOTIFIER_NON_BLOCKING_INVALIDATION_NOTIFIER_H_
#pragma once
#include <string>
@@ -16,10 +16,10 @@
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
-#include "chrome/browser/sync/notifier/invalidation_version_tracker.h"
-#include "chrome/browser/sync/notifier/sync_notifier.h"
-#include "chrome/browser/sync/notifier/sync_notifier_observer.h"
#include "jingle/notifier/base/notifier_options.h"
+#include "sync/notifier/invalidation_version_tracker.h"
+#include "sync/notifier/sync_notifier.h"
+#include "sync/notifier/sync_notifier_observer.h"
#include "sync/util/weak_handle.h"
namespace base {
@@ -80,4 +80,4 @@ class NonBlockingInvalidationNotifier
} // namespace sync_notifier
-#endif // CHROME_BROWSER_SYNC_NOTIFIER_NON_BLOCKING_INVALIDATION_NOTIFIER_H_
+#endif // SYNC_NOTIFIER_NON_BLOCKING_INVALIDATION_NOTIFIER_H_
diff --git a/chrome/browser/sync/notifier/non_blocking_invalidation_notifier_unittest.cc b/sync/notifier/non_blocking_invalidation_notifier_unittest.cc
index b67adf3..fea7742 100644
--- a/chrome/browser/sync/notifier/non_blocking_invalidation_notifier_unittest.cc
+++ b/sync/notifier/non_blocking_invalidation_notifier_unittest.cc
@@ -2,16 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/sync/notifier/non_blocking_invalidation_notifier.h"
+#include "sync/notifier/non_blocking_invalidation_notifier.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
#include "base/threading/thread.h"
-#include "chrome/browser/sync/notifier/invalidation_version_tracker.h"
-#include "chrome/browser/sync/notifier/mock_sync_notifier_observer.h"
#include "jingle/notifier/base/fake_base_task.h"
#include "net/url_request/url_request_test_util.h"
+#include "sync/notifier/invalidation_version_tracker.h"
+#include "sync/notifier/mock_sync_notifier_observer.h"
#include "sync/syncable/model_type.h"
#include "sync/syncable/model_type_payload_map.h"
#include "sync/util/weak_handle.h"
diff --git a/chrome/browser/sync/notifier/p2p_notifier.cc b/sync/notifier/p2p_notifier.cc
index ee3a4da6..49462ce 100644
--- a/chrome/browser/sync/notifier/p2p_notifier.cc
+++ b/sync/notifier/p2p_notifier.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/sync/notifier/p2p_notifier.h"
+#include "sync/notifier/p2p_notifier.h"
#include <algorithm>
@@ -11,7 +11,7 @@
#include "base/logging.h"
#include "base/message_loop_proxy.h"
#include "base/values.h"
-#include "chrome/browser/sync/notifier/sync_notifier_observer.h"
+#include "sync/notifier/sync_notifier_observer.h"
#include "sync/protocol/service_constants.h"
#include "sync/syncable/model_type_payload_map.h"
diff --git a/chrome/browser/sync/notifier/p2p_notifier.h b/sync/notifier/p2p_notifier.h
index b861c99..093d023 100644
--- a/chrome/browser/sync/notifier/p2p_notifier.h
+++ b/sync/notifier/p2p_notifier.h
@@ -5,8 +5,8 @@
// A notifier that uses p2p notifications based on XMPP push
// notifications. Used only for sync integration tests.
-#ifndef CHROME_BROWSER_SYNC_NOTIFIER_P2P_NOTIFIER_H_
-#define CHROME_BROWSER_SYNC_NOTIFIER_P2P_NOTIFIER_H_
+#ifndef SYNC_NOTIFIER_P2P_NOTIFIER_H_
+#define SYNC_NOTIFIER_P2P_NOTIFIER_H_
#include <string>
@@ -14,8 +14,8 @@
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/observer_list.h"
-#include "chrome/browser/sync/notifier/sync_notifier.h"
#include "jingle/notifier/listener/talk_mediator.h"
+#include "sync/notifier/sync_notifier.h"
#include "sync/syncable/model_type.h"
namespace base {
@@ -140,4 +140,4 @@ class P2PNotifier
};
} // namespace sync_notifier
-#endif // CHROME_BROWSER_SYNC_NOTIFIER_P2P_NOTIFIER_H_
+#endif // SYNC_NOTIFIER_P2P_NOTIFIER_H_
diff --git a/chrome/browser/sync/notifier/p2p_notifier_unittest.cc b/sync/notifier/p2p_notifier_unittest.cc
index 8045198..a9f8db9 100644
--- a/chrome/browser/sync/notifier/p2p_notifier_unittest.cc
+++ b/sync/notifier/p2p_notifier_unittest.cc
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/sync/notifier/p2p_notifier.h"
+#include "sync/notifier/p2p_notifier.h"
#include <cstddef>
#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
-#include "chrome/browser/sync/notifier/mock_sync_notifier_observer.h"
+#include "sync/notifier/mock_sync_notifier_observer.h"
#include "sync/syncable/model_type.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/sync/notifier/registration_manager.cc b/sync/notifier/registration_manager.cc
index 90a15d4..de844c5 100644
--- a/chrome/browser/sync/notifier/registration_manager.cc
+++ b/sync/notifier/registration_manager.cc
@@ -2,16 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/sync/notifier/registration_manager.h"
+#include "sync/notifier/registration_manager.h"
#include <algorithm>
#include <cstddef>
#include <string>
#include "base/rand_util.h"
-#include "chrome/browser/sync/notifier/invalidation_util.h"
#include "google/cacheinvalidation/include/invalidation-client.h"
#include "google/cacheinvalidation/include/types.h"
+#include "sync/notifier/invalidation_util.h"
#include "sync/syncable/model_type.h"
namespace sync_notifier {
diff --git a/chrome/browser/sync/notifier/registration_manager.h b/sync/notifier/registration_manager.h
index 49ebd47..e8639d0 100644
--- a/chrome/browser/sync/notifier/registration_manager.h
+++ b/sync/notifier/registration_manager.h
@@ -5,8 +5,8 @@
// A class that manages the registration of types for server-issued
// notifications.
-#ifndef CHROME_BROWSER_SYNC_NOTIFIER_REGISTRATION_MANAGER_H_
-#define CHROME_BROWSER_SYNC_NOTIFIER_REGISTRATION_MANAGER_H_
+#ifndef SYNC_NOTIFIER_REGISTRATION_MANAGER_H_
+#define SYNC_NOTIFIER_REGISTRATION_MANAGER_H_
#pragma once
#include <map>
@@ -174,4 +174,4 @@ class RegistrationManager {
} // namespace sync_notifier
-#endif // CHROME_BROWSER_SYNC_NOTIFIER_REGISTRATION_MANAGER_H_
+#endif // SYNC_NOTIFIER_REGISTRATION_MANAGER_H_
diff --git a/chrome/browser/sync/notifier/registration_manager_unittest.cc b/sync/notifier/registration_manager_unittest.cc
index 7f7abd5..21172f8 100644
--- a/chrome/browser/sync/notifier/registration_manager_unittest.cc
+++ b/sync/notifier/registration_manager_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/sync/notifier/registration_manager.h"
+#include "sync/notifier/registration_manager.h"
#include <algorithm>
#include <cmath>
@@ -12,8 +12,8 @@
#include "base/basictypes.h"
#include "base/message_loop.h"
-#include "chrome/browser/sync/notifier/invalidation_util.h"
#include "google/cacheinvalidation/include/invalidation-client.h"
+#include "sync/notifier/invalidation_util.h"
#include "sync/syncable/model_type.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/sync/notifier/state_writer.h b/sync/notifier/state_writer.h
index 84ac16a..c1b72b8 100644
--- a/chrome/browser/sync/notifier/state_writer.h
+++ b/sync/notifier/state_writer.h
@@ -1,11 +1,11 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
//
// Simple interface for something that persists state.
-#ifndef CHROME_BROWSER_SYNC_NOTIFIER_STATE_WRITER_H_
-#define CHROME_BROWSER_SYNC_NOTIFIER_STATE_WRITER_H_
+#ifndef SYNC_NOTIFIER_STATE_WRITER_H_
+#define SYNC_NOTIFIER_STATE_WRITER_H_
#pragma once
#include <string>
@@ -21,4 +21,4 @@ class StateWriter {
} // sync_notifier
-#endif // CHROME_BROWSER_SYNC_NOTIFIER_STATE_WRITER_H_
+#endif // SYNC_NOTIFIER_STATE_WRITER_H_
diff --git a/chrome/browser/sync/notifier/sync_notifier.h b/sync/notifier/sync_notifier.h
index 8980146..288d0ee 100644
--- a/chrome/browser/sync/notifier/sync_notifier.h
+++ b/sync/notifier/sync_notifier.h
@@ -6,8 +6,8 @@
// notifications when updates are available for a set of sync types.
// All the observers are notified when such an event happens.
-#ifndef CHROME_BROWSER_SYNC_NOTIFIER_SYNC_NOTIFIER_H_
-#define CHROME_BROWSER_SYNC_NOTIFIER_SYNC_NOTIFIER_H_
+#ifndef SYNC_NOTIFIER_SYNC_NOTIFIER_H_
+#define SYNC_NOTIFIER_SYNC_NOTIFIER_H_
#include <string>
@@ -51,5 +51,5 @@ class SyncNotifier {
};
} // namespace sync_notifier
-#endif // CHROME_BROWSER_SYNC_NOTIFIER_SYNC_NOTIFIER_H_
+#endif // SYNC_NOTIFIER_SYNC_NOTIFIER_H_
diff --git a/chrome/browser/sync/notifier/sync_notifier_factory.cc b/sync/notifier/sync_notifier_factory.cc
index 53671b2..f547633 100644
--- a/chrome/browser/sync/notifier/sync_notifier_factory.cc
+++ b/sync/notifier/sync_notifier_factory.cc
@@ -2,16 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/sync/notifier/sync_notifier_factory.h"
+#include "sync/notifier/sync_notifier_factory.h"
#include <string>
#include "base/logging.h"
-#include "chrome/browser/sync/notifier/non_blocking_invalidation_notifier.h"
-#include "chrome/browser/sync/notifier/p2p_notifier.h"
-#include "chrome/browser/sync/notifier/sync_notifier.h"
#include "jingle/notifier/listener/mediator_thread_impl.h"
#include "jingle/notifier/listener/talk_mediator_impl.h"
+#include "sync/notifier/non_blocking_invalidation_notifier.h"
+#include "sync/notifier/p2p_notifier.h"
+#include "sync/notifier/sync_notifier.h"
namespace sync_notifier {
namespace {
diff --git a/chrome/browser/sync/notifier/sync_notifier_factory.h b/sync/notifier/sync_notifier_factory.h
index a99a707..4aab659 100644
--- a/chrome/browser/sync/notifier/sync_notifier_factory.h
+++ b/sync/notifier/sync_notifier_factory.h
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_SYNC_NOTIFIER_SYNC_NOTIFIER_FACTORY_H_
-#define CHROME_BROWSER_SYNC_NOTIFIER_SYNC_NOTIFIER_FACTORY_H_
+#ifndef SYNC_NOTIFIER_SYNC_NOTIFIER_FACTORY_H_
+#define SYNC_NOTIFIER_SYNC_NOTIFIER_FACTORY_H_
#include <string>
#include "base/memory/weak_ptr.h"
-#include "chrome/browser/sync/notifier/invalidation_version_tracker.h"
#include "jingle/notifier/base/notifier_options.h"
+#include "sync/notifier/invalidation_version_tracker.h"
#include "sync/util/weak_handle.h"
namespace sync_notifier {
@@ -45,4 +45,4 @@ class SyncNotifierFactory {
} // namespace sync_notifier
-#endif // CHROME_BROWSER_SYNC_NOTIFIER_SYNC_NOTIFIER_FACTORY_H_
+#endif // SYNC_NOTIFIER_SYNC_NOTIFIER_FACTORY_H_
diff --git a/chrome/browser/sync/notifier/sync_notifier_factory_unittest.cc b/sync/notifier/sync_notifier_factory_unittest.cc
index a001c6b..f895772 100644
--- a/chrome/browser/sync/notifier/sync_notifier_factory_unittest.cc
+++ b/sync/notifier/sync_notifier_factory_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/sync/notifier/sync_notifier_factory.h"
+#include "sync/notifier/sync_notifier_factory.h"
#include "base/command_line.h"
#include "base/compiler_specific.h"
@@ -11,12 +11,12 @@
#include "base/memory/weak_ptr.h"
#include "base/message_loop.h"
#include "base/threading/thread.h"
-#include "chrome/browser/sync/notifier/invalidation_version_tracker.h"
-#include "chrome/browser/sync/notifier/mock_sync_notifier_observer.h"
-#include "chrome/browser/sync/notifier/sync_notifier.h"
#include "jingle/notifier/base/notification_method.h"
#include "jingle/notifier/base/notifier_options.h"
#include "net/url_request/url_request_test_util.h"
+#include "sync/notifier/invalidation_version_tracker.h"
+#include "sync/notifier/mock_sync_notifier_observer.h"
+#include "sync/notifier/sync_notifier.h"
#include "sync/syncable/model_type.h"
#include "sync/syncable/model_type_payload_map.h"
#include "testing/gmock/include/gmock/gmock.h"
diff --git a/chrome/browser/sync/notifier/sync_notifier_observer.h b/sync/notifier/sync_notifier_observer.h
index 627595b..0d6cc02 100644
--- a/chrome/browser/sync/notifier/sync_notifier_observer.h
+++ b/sync/notifier/sync_notifier_observer.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_SYNC_NOTIFIER_SYNC_NOTIFIER_OBSERVER_H_
-#define CHROME_BROWSER_SYNC_NOTIFIER_SYNC_NOTIFIER_OBSERVER_H_
+#ifndef SYNC_NOTIFIER_SYNC_NOTIFIER_OBSERVER_H_
+#define SYNC_NOTIFIER_SYNC_NOTIFIER_OBSERVER_H_
#pragma once
#include <string>
@@ -36,4 +36,4 @@ class SyncNotifierObserver {
} // namespace sync_notifier
-#endif // CHROME_BROWSER_SYNC_NOTIFIER_SYNC_NOTIFIER_OBSERVER_H_
+#endif // SYNC_NOTIFIER_SYNC_NOTIFIER_OBSERVER_H_
diff --git a/sync/sync.gyp b/sync/sync.gyp
index 599f915..59073ad 100644
--- a/sync/sync.gyp
+++ b/sync/sync.gyp
@@ -184,6 +184,50 @@
],
},
+ # The sync notifications library.
+ {
+ 'target_name': 'sync_notifier',
+ 'type': 'static_library',
+ 'variables': { 'enable_wexit_time_destructors': 1, },
+ 'include_dirs': [
+ '..',
+ ],
+ 'dependencies': [
+ '../base/base.gyp:base',
+ '../jingle/jingle.gyp:notifier',
+ '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
+ '../third_party/libjingle/libjingle.gyp:libjingle',
+ 'sync',
+ ],
+ 'export_dependent_settings': [
+ '../jingle/jingle.gyp:notifier',
+ '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
+ ],
+ 'sources': [
+ 'notifier/cache_invalidation_packet_handler.cc',
+ 'notifier/cache_invalidation_packet_handler.h',
+ 'notifier/chrome_invalidation_client.cc',
+ 'notifier/chrome_invalidation_client.h',
+ 'notifier/chrome_system_resources.cc',
+ 'notifier/chrome_system_resources.h',
+ 'notifier/invalidation_notifier.h',
+ 'notifier/invalidation_notifier.cc',
+ 'notifier/invalidation_util.cc',
+ 'notifier/invalidation_util.h',
+ 'notifier/invalidation_version_tracker.h',
+ 'notifier/non_blocking_invalidation_notifier.h',
+ 'notifier/non_blocking_invalidation_notifier.cc',
+ 'notifier/p2p_notifier.h',
+ 'notifier/p2p_notifier.cc',
+ 'notifier/registration_manager.cc',
+ 'notifier/registration_manager.h',
+ 'notifier/state_writer.h',
+ 'notifier/sync_notifier.h',
+ 'notifier/sync_notifier_factory.h',
+ 'notifier/sync_notifier_factory.cc',
+ ],
+ },
+
# Test support files for the 'sync' target.
{
'target_name': 'test_support_sync',
@@ -243,6 +287,28 @@
],
},
+ # Test support files for the 'sync_notifier' target.
+ {
+ 'target_name': 'test_support_sync_notifier',
+ 'type': 'static_library',
+ 'variables': { 'enable_wexit_time_destructors': 1, },
+ 'include_dirs': [
+ '..',
+ ],
+ 'dependencies': [
+ '../testing/gmock.gyp:gmock',
+ 'sync_notifier',
+ ],
+ 'export_dependent_settings': [
+ '../testing/gmock.gyp:gmock',
+ 'sync_notifier',
+ ],
+ 'sources': [
+ 'notifier/mock_sync_notifier_observer.cc',
+ 'notifier/mock_sync_notifier_observer.h',
+ ],
+ },
+
# Unit tests for the 'sync' target. This cannot be a static
# library because the unit test files have to be compiled directly
# into the executable, so we push the target files to the
@@ -323,6 +389,59 @@
},
},
+ # Unit tests for the 'sync_notifier' target. This cannot be a static
+ # library because the unit test files have to be compiled directly
+ # into the executable, so we push the target files to the
+ # depending executable target via direct_dependent_settings.
+ {
+ 'target_name': 'sync_notifier_tests',
+ 'type': 'none',
+ # We only want unit test executables to include this target.
+ 'suppress_wildcard': 1,
+ 'dependencies': [
+ '../base/base.gyp:base',
+ '../jingle/jingle.gyp:notifier_test_util',
+ '../net/net.gyp:net_test_support',
+ '../testing/gmock.gyp:gmock',
+ '../testing/gtest.gyp:gtest',
+ '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
+ '../third_party/libjingle/libjingle.gyp:libjingle',
+ 'sync',
+ 'sync_notifier',
+ 'test_support_sync_notifier',
+ ],
+ # Propagate all dependencies since the actual compilation
+ # happens in the dependents.
+ 'export_dependent_settings': [
+ '../base/base.gyp:base',
+ '../jingle/jingle.gyp:notifier_test_util',
+ '../net/net.gyp:net_test_support',
+ '../testing/gmock.gyp:gmock',
+ '../testing/gtest.gyp:gtest',
+ '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
+ '../third_party/libjingle/libjingle.gyp:libjingle',
+ 'sync',
+ 'sync_notifier',
+ 'test_support_sync_notifier',
+ ],
+ 'direct_dependent_settings': {
+ 'variables': { 'enable_wexit_time_destructors': 1, },
+ 'include_dirs': [
+ '..',
+ ],
+ 'sources': [
+ 'notifier/cache_invalidation_packet_handler_unittest.cc',
+ 'notifier/chrome_invalidation_client_unittest.cc',
+ 'notifier/chrome_system_resources_unittest.cc',
+ 'notifier/invalidation_notifier_unittest.cc',
+ 'notifier/non_blocking_invalidation_notifier_unittest.cc',
+ 'notifier/p2p_notifier_unittest.cc',
+ 'notifier/registration_manager_unittest.cc',
+ 'notifier/sync_notifier_factory_unittest.cc',
+ ],
+ },
+ },
+
# The unit test executable for sync tests. Currently this isn't
# automatically run, as there is already a sync_unit_tests
# executable in chrome.gyp; this is just to make sure that all the
@@ -337,6 +456,7 @@
'dependencies': [
'../base/base.gyp:run_all_unittests',
'sync_tests',
+ 'sync_notifier_tests',
],
# TODO(akalin): This is needed because histogram.cc uses
# leak_annotations.h, which pulls this in. Make 'base'