diff options
109 files changed, 301 insertions, 377 deletions
diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS index 525407e..47890d2 100644 --- a/chrome/browser/DEPS +++ b/chrome/browser/DEPS @@ -87,7 +87,6 @@ include_rules = [ "+sandbox/win/src", # The path doesn't say it, but this is the Windows sandbox. "+skia/ext", "+sync/api", # Sync API files. - "+sync/notifier", # Sync invalidation API files. "+sync/protocol", # Sync protobuf files. "+third_party/cros_system_api", "+win8/util", diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_invalidator.cc b/chrome/browser/chromeos/policy/device_cloud_policy_invalidator.cc index b1e1759..21d532a 100644 --- a/chrome/browser/chromeos/policy/device_cloud_policy_invalidator.cc +++ b/chrome/browser/chromeos/policy/device_cloud_policy_invalidator.cc @@ -23,7 +23,9 @@ #include "chrome/browser/policy/cloud/cloud_policy_invalidator.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/chrome_content_client.h" +#include "components/invalidation/invalidation_handler.h" #include "components/invalidation/invalidation_service.h" +#include "components/invalidation/invalidation_state_tracker.h" #include "components/invalidation/invalidator_storage.h" #include "components/invalidation/profile_invalidation_provider.h" #include "components/invalidation/ticl_invalidation_service.h" @@ -33,8 +35,6 @@ #include "google_apis/gaia/identity_provider.h" #include "net/url_request/url_request_context_getter.h" #include "sync/internal_api/public/base/invalidator_state.h" -#include "sync/notifier/invalidation_handler.h" -#include "sync/notifier/invalidation_state_tracker.h" class Profile; diff --git a/chrome/browser/drive/drive_notification_manager.cc b/chrome/browser/drive/drive_notification_manager.cc index 3deda59..0ba122b 100644 --- a/chrome/browser/drive/drive_notification_manager.cc +++ b/chrome/browser/drive/drive_notification_manager.cc @@ -7,8 +7,8 @@ #include "base/metrics/histogram.h" #include "chrome/browser/drive/drive_notification_observer.h" #include "components/invalidation/invalidation_service.h" +#include "components/invalidation/object_id_invalidation_map.h" #include "google/cacheinvalidation/types.pb.h" -#include "sync/notifier/object_id_invalidation_map.h" namespace drive { diff --git a/chrome/browser/drive/drive_notification_manager.h b/chrome/browser/drive/drive_notification_manager.h index c6712b2..793c1ab 100644 --- a/chrome/browser/drive/drive_notification_manager.h +++ b/chrome/browser/drive/drive_notification_manager.h @@ -9,8 +9,8 @@ #include "base/observer_list.h" #include "base/timer/timer.h" #include "chrome/browser/drive/drive_notification_observer.h" +#include "components/invalidation/invalidation_handler.h" #include "components/keyed_service/core/keyed_service.h" -#include "sync/notifier/invalidation_handler.h" class ProfileSyncService; diff --git a/chrome/browser/extensions/api/push_messaging/DEPS b/chrome/browser/extensions/api/push_messaging/DEPS index 8fd8624..8c7d15a 100644 --- a/chrome/browser/extensions/api/push_messaging/DEPS +++ b/chrome/browser/extensions/api/push_messaging/DEPS @@ -1,6 +1,6 @@ include_rules = [ + "+components/invalidation", "+google/cacheinvalidation/types.pb.h", "+sync/internal_api/public/base/invalidation.h", - "+sync/notifier/sync_notifier_observer.h", - "+components/invalidation", + "+sync/internal_api/public/base/invalidation_util.h", ] diff --git a/chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.cc b/chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.cc index 0a6f52c..b642967 100644 --- a/chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.cc +++ b/chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.cc @@ -11,9 +11,9 @@ #include "base/strings/string_split.h" #include "chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler_delegate.h" #include "components/invalidation/invalidation_service.h" +#include "components/invalidation/object_id_invalidation_map.h" #include "extensions/common/extension.h" #include "google/cacheinvalidation/types.pb.h" -#include "sync/notifier/object_id_invalidation_map.h" namespace extensions { diff --git a/chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.h b/chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.h index cf580d6..c666ed3 100644 --- a/chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.h +++ b/chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.h @@ -13,8 +13,8 @@ #include "base/compiler_specific.h" #include "base/threading/thread_checker.h" #include "chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_mapper.h" -#include "sync/notifier/invalidation_handler.h" -#include "sync/notifier/invalidation_util.h" +#include "components/invalidation/invalidation_handler.h" +#include "sync/internal_api/public/base/invalidation_util.h" namespace invalidation { class InvalidationService; diff --git a/chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler_unittest.cc b/chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler_unittest.cc index 89dbdc4..d348399 100644 --- a/chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler_unittest.cc +++ b/chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler_unittest.cc @@ -9,8 +9,8 @@ #include "chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler_delegate.h" #include "components/invalidation/invalidation_logger.h" #include "components/invalidation/invalidation_service.h" +#include "components/invalidation/object_id_invalidation_map.h" #include "google/cacheinvalidation/types.pb.h" -#include "sync/notifier/object_id_invalidation_map.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/invalidation/fake_invalidation_service.cc b/chrome/browser/invalidation/fake_invalidation_service.cc index fdf115a..c4a6cdd 100644 --- a/chrome/browser/invalidation/fake_invalidation_service.cc +++ b/chrome/browser/invalidation/fake_invalidation_service.cc @@ -6,7 +6,7 @@ #include "base/macros.h" #include "components/invalidation/invalidation_service_util.h" -#include "sync/notifier/object_id_invalidation_map.h" +#include "components/invalidation/object_id_invalidation_map.h" namespace invalidation { diff --git a/chrome/browser/invalidation/fake_invalidation_service.h b/chrome/browser/invalidation/fake_invalidation_service.h index 8a6b881..b73d8ea 100644 --- a/chrome/browser/invalidation/fake_invalidation_service.h +++ b/chrome/browser/invalidation/fake_invalidation_service.h @@ -13,8 +13,8 @@ #include "chrome/browser/signin/fake_profile_oauth2_token_service.h" #include "components/invalidation/invalidation_service.h" #include "components/invalidation/invalidator_registrar.h" +#include "components/invalidation/mock_ack_handler.h" #include "google_apis/gaia/fake_identity_provider.h" -#include "sync/notifier/mock_ack_handler.h" namespace syncer { class Invalidation; diff --git a/chrome/browser/invalidation/invalidation_controller_android.h b/chrome/browser/invalidation/invalidation_controller_android.h index 03b29f9..196e54a 100644 --- a/chrome/browser/invalidation/invalidation_controller_android.h +++ b/chrome/browser/invalidation/invalidation_controller_android.h @@ -9,7 +9,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_weak_ref.h" -#include "sync/notifier/invalidation_util.h" +#include "sync/internal_api/public/base/invalidation_util.h" namespace invalidation { diff --git a/chrome/browser/invalidation/invalidation_service_android.cc b/chrome/browser/invalidation/invalidation_service_android.cc index 57a34bd..9780f81 100644 --- a/chrome/browser/invalidation/invalidation_service_android.cc +++ b/chrome/browser/invalidation/invalidation_service_android.cc @@ -6,8 +6,8 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/invalidation/invalidation_controller_android.h" +#include "components/invalidation/object_id_invalidation_map.h" #include "content/public/browser/notification_service.h" -#include "sync/notifier/object_id_invalidation_map.h" namespace invalidation { diff --git a/chrome/browser/invalidation/invalidator_storage_unittest.cc b/chrome/browser/invalidation/invalidator_storage_unittest.cc index aeb0a02..c59e665 100644 --- a/chrome/browser/invalidation/invalidator_storage_unittest.cc +++ b/chrome/browser/invalidation/invalidator_storage_unittest.cc @@ -8,7 +8,7 @@ #include "base/strings/string_util.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_pref_service_syncable.h" -#include "sync/notifier/unacked_invalidation_set_test_util.h" +#include "components/invalidation/unacked_invalidation_set_test_util.h" #include "testing/gtest/include/gtest/gtest.h" namespace invalidation { diff --git a/chrome/browser/invalidation/profile_invalidation_provider_factory.cc b/chrome/browser/invalidation/profile_invalidation_provider_factory.cc index 2f19144..f54a63b 100644 --- a/chrome/browser/invalidation/profile_invalidation_provider_factory.cc +++ b/chrome/browser/invalidation/profile_invalidation_provider_factory.cc @@ -18,6 +18,7 @@ #include "chrome/common/chrome_content_client.h" #include "chrome/common/pref_names.h" #include "components/invalidation/invalidation_service.h" +#include "components/invalidation/invalidation_state_tracker.h" #include "components/invalidation/invalidator_storage.h" #include "components/invalidation/profile_invalidation_provider.h" #include "components/invalidation/ticl_invalidation_service.h" @@ -27,7 +28,6 @@ #include "components/signin/core/browser/profile_oauth2_token_service.h" #include "components/signin/core/browser/signin_manager.h" #include "net/url_request/url_request_context_getter.h" -#include "sync/notifier/invalidation_state_tracker.h" #if defined(OS_ANDROID) #include "chrome/browser/invalidation/invalidation_controller_android.h" diff --git a/chrome/browser/invalidation/ticl_profile_settings_provider_unittest.cc b/chrome/browser/invalidation/ticl_profile_settings_provider_unittest.cc index 0f24347..0c379d0 100644 --- a/chrome/browser/invalidation/ticl_profile_settings_provider_unittest.cc +++ b/chrome/browser/invalidation/ticl_profile_settings_provider_unittest.cc @@ -12,6 +12,7 @@ #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" #include "components/invalidation/fake_invalidation_state_tracker.h" +#include "components/invalidation/invalidation_state_tracker.h" #include "components/invalidation/ticl_invalidation_service.h" #include "components/invalidation/ticl_settings_provider.h" #include "content/public/test/test_browser_thread_bundle.h" @@ -19,7 +20,6 @@ #include "google_apis/gaia/fake_oauth2_token_service.h" #include "google_apis/gaia/identity_provider.h" #include "net/url_request/url_request_context_getter.h" -#include "sync/notifier/invalidation_state_tracker.h" #include "testing/gtest/include/gtest/gtest.h" namespace invalidation { diff --git a/chrome/browser/policy/cloud/DEPS b/chrome/browser/policy/cloud/DEPS index 0415326..5131eea 100644 --- a/chrome/browser/policy/cloud/DEPS +++ b/chrome/browser/policy/cloud/DEPS @@ -49,5 +49,6 @@ specific_include_rules = { r"cloud_policy_invalidator_unittest\.cc": [ "+chrome/browser/invalidation/fake_invalidation_service.h", + "+sync/internal_api/public/base/invalidation_util.h", ], } diff --git a/chrome/browser/policy/cloud/cloud_policy_invalidator.cc b/chrome/browser/policy/cloud/cloud_policy_invalidator.cc index ecef924..6ba5047 100644 --- a/chrome/browser/policy/cloud/cloud_policy_invalidator.cc +++ b/chrome/browser/policy/cloud/cloud_policy_invalidator.cc @@ -14,11 +14,11 @@ #include "base/time/time.h" #include "base/values.h" #include "components/invalidation/invalidation_service.h" +#include "components/invalidation/object_id_invalidation_map.h" #include "components/policy/core/common/cloud/cloud_policy_client.h" #include "components/policy/core/common/cloud/cloud_policy_refresh_scheduler.h" #include "components/policy/core/common/cloud/enterprise_metrics.h" #include "policy/policy_constants.h" -#include "sync/notifier/object_id_invalidation_map.h" namespace policy { diff --git a/chrome/browser/policy/cloud/cloud_policy_invalidator.h b/chrome/browser/policy/cloud/cloud_policy_invalidator.h index 3a8745b..1a73fa5 100644 --- a/chrome/browser/policy/cloud/cloud_policy_invalidator.h +++ b/chrome/browser/policy/cloud/cloud_policy_invalidator.h @@ -13,11 +13,11 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h" +#include "components/invalidation/invalidation_handler.h" #include "components/policy/core/common/cloud/cloud_policy_core.h" #include "components/policy/core/common/cloud/cloud_policy_store.h" #include "google/cacheinvalidation/include/types.h" #include "sync/internal_api/public/base/invalidation.h" -#include "sync/notifier/invalidation_handler.h" namespace base { class Clock; diff --git a/chrome/browser/policy/cloud/cloud_policy_invalidator_unittest.cc b/chrome/browser/policy/cloud/cloud_policy_invalidator_unittest.cc index 68628b8f..1fe6cba 100644 --- a/chrome/browser/policy/cloud/cloud_policy_invalidator_unittest.cc +++ b/chrome/browser/policy/cloud/cloud_policy_invalidator_unittest.cc @@ -29,7 +29,7 @@ #include "components/policy/core/common/policy_types.h" #include "policy/policy_constants.h" #include "policy/proto/device_management_backend.pb.h" -#include "sync/notifier/invalidation_util.h" +#include "sync/internal_api/public/base/invalidation_util.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/sync/DEPS b/chrome/browser/sync/DEPS index 412eab0..776c534 100644 --- a/chrome/browser/sync/DEPS +++ b/chrome/browser/sync/DEPS @@ -7,7 +7,6 @@ include_rules = [ # For files not in a subdirectory. "+sync/internal_api/public", "+sync/js", - "+sync/notifier", # TODO(tim): Remove everything below. Bug 131130. "+sync/util/cryptographer.h", diff --git a/chrome/browser/sync/glue/DEPS b/chrome/browser/sync/glue/DEPS index 9e1dbf5..55ff6f1 100644 --- a/chrome/browser/sync/glue/DEPS +++ b/chrome/browser/sync/glue/DEPS @@ -9,15 +9,6 @@ include_rules = [ "+jingle/notifier/base", - # Should these live in their own "includes" (e.g) directory(ies)? - # Bug 19878. - "+sync/notifier/invalidation_util.h", - "+sync/notifier/mock_sync_notifier_observer.h", - "+sync/notifier/sync_notifier.h", - "+sync/notifier/sync_notifier_helper.h", - "+sync/notifier/sync_notifier_factory.h", - "+sync/notifier/sync_notifier_observer.h", - # TODO(zea): SessionModelAssociator shouldn't need this. # TODO(sync): Also need to fix crbug.com/123674. "+sync/syncable", diff --git a/chrome/browser/sync/glue/sync_backend_host_core.cc b/chrome/browser/sync/glue/sync_backend_host_core.cc index 7e4ab73..a32dad1 100644 --- a/chrome/browser/sync/glue/sync_backend_host_core.cc +++ b/chrome/browser/sync/glue/sync_backend_host_core.cc @@ -11,6 +11,8 @@ #include "chrome/browser/sync/glue/sync_backend_registrar.h" #include "chrome/browser/sync/glue/synced_device_tracker.h" #include "chrome/common/chrome_version_info.h" +#include "components/invalidation/object_id_invalidation_map.h" +#include "sync/internal_api/public/base/invalidation_util.h" #include "sync/internal_api/public/events/protocol_event.h" #include "sync/internal_api/public/http_post_provider_factory.h" #include "sync/internal_api/public/internal_components_factory.h" @@ -21,8 +23,6 @@ #include "sync/internal_api/public/sync_context_proxy.h" #include "sync/internal_api/public/sync_manager.h" #include "sync/internal_api/public/sync_manager_factory.h" -#include "sync/notifier/invalidation_util.h" -#include "sync/notifier/object_id_invalidation_map.h" // Helper macros to log with the syncer thread name; useful when there // are multiple syncers involved. diff --git a/chrome/browser/sync/glue/sync_backend_host_impl.cc b/chrome/browser/sync/glue/sync_backend_host_impl.cc index dc0de63..59d0c3c 100644 --- a/chrome/browser/sync/glue/sync_backend_host_impl.cc +++ b/chrome/browser/sync/glue/sync_backend_host_impl.cc @@ -13,6 +13,7 @@ #include "chrome/browser/sync/glue/sync_backend_registrar.h" #include "chrome/common/chrome_switches.h" #include "components/invalidation/invalidation_service.h" +#include "components/invalidation/object_id_invalidation_map.h" #include "components/network_time/network_time_tracker.h" #include "components/sync_driver/sync_frontend.h" #include "components/sync_driver/sync_prefs.h" @@ -29,7 +30,6 @@ #include "sync/internal_api/public/sync_manager_factory.h" #include "sync/internal_api/public/util/experiments.h" #include "sync/internal_api/public/util/sync_string_conversions.h" -#include "sync/notifier/object_id_invalidation_map.h" // Helper macros to log with the syncer thread name; useful when there // are multiple syncers involved. diff --git a/chrome/browser/sync/glue/sync_backend_host_impl.h b/chrome/browser/sync/glue/sync_backend_host_impl.h index 2eb6014..629722a 100644 --- a/chrome/browser/sync/glue/sync_backend_host_impl.h +++ b/chrome/browser/sync/glue/sync_backend_host_impl.h @@ -15,6 +15,7 @@ #include "base/threading/thread.h" #include "chrome/browser/sync/glue/extensions_activity_monitor.h" #include "chrome/browser/sync/glue/sync_backend_host.h" +#include "components/invalidation/invalidation_handler.h" #include "components/sync_driver/backend_data_type_configurer.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" @@ -26,7 +27,6 @@ #include "sync/internal_api/public/util/report_unrecoverable_error_function.h" #include "sync/internal_api/public/util/unrecoverable_error_handler.h" #include "sync/internal_api/public/util/weak_handle.h" -#include "sync/notifier/invalidation_handler.h" #include "sync/protocol/encryption.pb.h" #include "sync/protocol/sync_protocol_error.h" #include "sync/util/extensions_activity.h" diff --git a/chrome/browser/sync/profile_sync_service_android.cc b/chrome/browser/sync/profile_sync_service_android.cc index 6dfed12..02e3556 100644 --- a/chrome/browser/sync/profile_sync_service_android.cc +++ b/chrome/browser/sync/profile_sync_service_android.cc @@ -22,6 +22,7 @@ #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/profile_sync_service_factory.h" #include "chrome/browser/sync/sync_ui_util.h" +#include "components/invalidation/object_id_invalidation_map.h" #include "components/signin/core/browser/signin_manager.h" #include "components/sync_driver/pref_names.h" #include "components/sync_driver/sync_prefs.h" @@ -34,7 +35,6 @@ #include "grit/generated_resources.h" #include "jni/ProfileSyncService_jni.h" #include "sync/internal_api/public/read_transaction.h" -#include "sync/notifier/object_id_invalidation_map.h" #include "ui/base/l10n/l10n_util.h" using base::android::AttachCurrentThread; diff --git a/chrome/browser/sync/profile_sync_service_android.h b/chrome/browser/sync/profile_sync_service_android.h index 72f9fc5..5e1310c 100644 --- a/chrome/browser/sync/profile_sync_service_android.h +++ b/chrome/browser/sync/profile_sync_service_android.h @@ -16,6 +16,7 @@ #include "components/sync_driver/sync_prefs.h" #include "google/cacheinvalidation/include/types.h" #include "google_apis/gaia/google_service_auth_error.h" +#include "sync/internal_api/public/base/invalidation_util.h" class Profile; class ProfileSyncService; diff --git a/chrome/browser/sync/test/integration/fake_server_invalidation_service.cc b/chrome/browser/sync/test/integration/fake_server_invalidation_service.cc index 47c99c9..d145b6b 100644 --- a/chrome/browser/sync/test/integration/fake_server_invalidation_service.cc +++ b/chrome/browser/sync/test/integration/fake_server_invalidation_service.cc @@ -8,9 +8,9 @@ #include "base/macros.h" #include "components/invalidation/invalidation_service_util.h" +#include "components/invalidation/object_id_invalidation_map.h" #include "sync/internal_api/public/base/invalidation.h" #include "sync/internal_api/public/base/model_type.h" -#include "sync/notifier/object_id_invalidation_map.h" # namespace fake_server { diff --git a/chrome/browser/ui/webui/DEPS b/chrome/browser/ui/webui/DEPS index acfa06d..8255dae 100644 --- a/chrome/browser/ui/webui/DEPS +++ b/chrome/browser/ui/webui/DEPS @@ -6,6 +6,7 @@ include_rules = [ "+sync/internal_api/public/sessions", "+sync/internal_api/public/events", "+sync/internal_api/public/util/weak_handle.h", + "+sync/internal_api/public/base/invalidation_util.h", # Other libraries. "+components/onc", diff --git a/chrome/browser/ui/webui/invalidations_message_handler.cc b/chrome/browser/ui/webui/invalidations_message_handler.cc index 1b2e59a..8d5586d 100644 --- a/chrome/browser/ui/webui/invalidations_message_handler.cc +++ b/chrome/browser/ui/webui/invalidations_message_handler.cc @@ -7,11 +7,11 @@ #include "base/bind.h" #include "chrome/browser/invalidation/profile_invalidation_provider_factory.h" #include "chrome/browser/profiles/profile.h" +#include "components/invalidation/invalidation_handler.h" #include "components/invalidation/invalidation_logger.h" #include "components/invalidation/invalidation_service.h" #include "components/invalidation/profile_invalidation_provider.h" #include "content/public/browser/web_ui.h" -#include "sync/notifier/invalidation_handler.h" namespace invalidation { class InvalidationLogger; diff --git a/chrome/browser/ui/webui/invalidations_message_handler.h b/chrome/browser/ui/webui/invalidations_message_handler.h index b8e3f09..04cb678 100644 --- a/chrome/browser/ui/webui/invalidations_message_handler.h +++ b/chrome/browser/ui/webui/invalidations_message_handler.h @@ -11,7 +11,7 @@ #include "base/values.h" #include "components/invalidation/invalidation_logger_observer.h" #include "content/public/browser/web_ui_message_handler.h" -#include "sync/notifier/invalidation_util.h" +#include "sync/internal_api/public/base/invalidation_util.h" class Profile; diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi index d81084b..3798261 100644 --- a/chrome/chrome_tests_unit.gypi +++ b/chrome/chrome_tests_unit.gypi @@ -22,6 +22,7 @@ '../components/components.gyp:bookmarks_test_support', '../components/components.gyp:gcm_driver_test_support', '../components/components.gyp:history_core_test_support', + '../components/components.gyp:invalidation', '../components/components.gyp:invalidation_test_support', '../components/components.gyp:metrics_test_support', '../components/components.gyp:password_manager_core_browser_test_support', @@ -495,7 +496,6 @@ '../sync/sync.gyp:test_support_sync_api', '../sync/sync.gyp:test_support_sync_core', '../sync/sync.gyp:test_support_sync_internal_api', - '../sync/sync.gyp:test_support_sync_notifier', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', 'test_support_common', diff --git a/components/components_tests.gyp b/components/components_tests.gyp index b33019a..996fcef 100644 --- a/components/components_tests.gyp +++ b/components/components_tests.gyp @@ -298,6 +298,8 @@ # Dependencies of invalidation 'components.gyp:invalidation', 'components.gyp:invalidation_test_support', + '../jingle/jingle.gyp:notifier_test_util', + '../third_party/libjingle/libjingle.gyp:libjingle', # Dependencies of json_schema 'components.gyp:json_schema', @@ -545,11 +547,15 @@ 'invalidation/invalidation_notifier_unittest.cc', 'invalidation/invalidator_registrar_unittest.cc', 'invalidation/non_blocking_invalidator_unittest.cc', + 'invalidation/object_id_invalidation_map_unittest.cc', 'invalidation/p2p_invalidator_unittest.cc', 'invalidation/push_client_channel_unittest.cc', + 'invalidation/registration_manager_unittest.cc', + 'invalidation/single_object_invalidation_set_unittest.cc', 'invalidation/sync_invalidation_listener_unittest.cc', 'invalidation/sync_system_resources_unittest.cc', 'invalidation/ticl_invalidation_service_unittest.cc', + 'invalidation/unacked_invalidation_set_unittest.cc', ], }], ['chromeos==1', { diff --git a/components/invalidation.gypi b/components/invalidation.gypi index 8759451..769e269 100644 --- a/components/invalidation.gypi +++ b/components/invalidation.gypi @@ -14,16 +14,23 @@ '../jingle/jingle.gyp:notifier', '../sync/sync.gyp:sync', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation', + # TODO(akalin): Remove this (http://crbug.com/133352). + '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp', 'gcm_driver', 'keyed_service_core', 'pref_registry', 'signin_core_browser', ], + 'export_dependent_settings': [ + '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation', + ], 'include_dirs': [ '..', ], 'sources': [ # Note: sources list duplicated in GN build. + 'invalidation/invalidation_handler.cc', + 'invalidation/invalidation_handler.h', 'invalidation/invalidation_logger.cc', 'invalidation/invalidation_logger.h', 'invalidation/invalidation_logger_observer.h', @@ -32,14 +39,26 @@ 'invalidation/invalidation_service.h', 'invalidation/invalidation_service_util.cc', 'invalidation/invalidation_service_util.h', + 'invalidation/invalidation_state_tracker.cc', + 'invalidation/invalidation_state_tracker.h', 'invalidation/invalidation_switches.cc', 'invalidation/invalidation_switches.h', + 'invalidation/invalidator.cc', + 'invalidation/invalidator.h', 'invalidation/invalidator_registrar.cc', 'invalidation/invalidator_registrar.h', 'invalidation/invalidator_storage.cc', 'invalidation/invalidator_storage.h', + 'invalidation/mock_ack_handler.cc', + 'invalidation/mock_ack_handler.h', + 'invalidation/object_id_invalidation_map.cc', + 'invalidation/object_id_invalidation_map.h', 'invalidation/profile_invalidation_provider.cc', 'invalidation/profile_invalidation_provider.h', + 'invalidation/single_object_invalidation_set.cc', + 'invalidation/single_object_invalidation_set.h', + 'invalidation/unacked_invalidation_set.cc', + 'invalidation/unacked_invalidation_set.h', ], 'conditions': [ ['OS != "android"', { @@ -60,6 +79,8 @@ 'invalidation/p2p_invalidator.h', 'invalidation/push_client_channel.cc', 'invalidation/push_client_channel.h', + 'invalidation/registration_manager.cc', + 'invalidation/registration_manager.h', 'invalidation/state_writer.h', 'invalidation/sync_invalidation_listener.cc', 'invalidation/sync_invalidation_listener.h', @@ -85,7 +106,6 @@ '../jingle/jingle.gyp:notifier_test_util', '../net/net.gyp:net', '../sync/sync.gyp:sync', - '../sync/sync.gyp:test_support_sync_notifier', '../testing/gmock.gyp:gmock', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation', 'gcm_driver_test_support', @@ -106,6 +126,10 @@ 'invalidation/invalidation_service_test_template.h', 'invalidation/invalidator_test_template.cc', 'invalidation/invalidator_test_template.h', + 'invalidation/object_id_invalidation_map_test_util.cc', + 'invalidation/object_id_invalidation_map_test_util.h', + 'invalidation/unacked_invalidation_set_test_util.cc', + 'invalidation/unacked_invalidation_set_test_util.h', ], 'conditions': [ ['OS != "android"', { diff --git a/components/invalidation/BUILD.gn b/components/invalidation/BUILD.gn index f4ecdc6..0bf7988 100644 --- a/components/invalidation/BUILD.gn +++ b/components/invalidation/BUILD.gn @@ -4,6 +4,8 @@ static_library("invalidation") { sources = [ + "invalidation_handler.cc", + "invalidation_handler.h", "invalidation_logger.cc", "invalidation_logger.h", "invalidation_logger_observer.h", @@ -12,14 +14,26 @@ static_library("invalidation") { "invalidation_service.h", "invalidation_service_util.cc", "invalidation_service_util.h", + "invalidation_state_tracker.cc", + "invalidation_state_tracker.h", "invalidation_switches.cc", "invalidation_switches.h", + "invalidator.cc", + "invalidator.h", "invalidator_registrar.cc", "invalidator_registrar.h", "invalidator_storage.cc", "invalidator_storage.h", + "mock_ack_handler.cc", + "mock_ack_handler.h", + "object_id_invalidation_map.cc", + "object_id_invalidation_map.h", "profile_invalidation_provider.cc", "profile_invalidation_provider.h", + "single_object_invalidation_set.cc", + "single_object_invalidation_set.h", + "unacked_invalidation_set.cc", + "unacked_invalidation_set.h", ] if (!is_android) { sources += [ @@ -38,6 +52,8 @@ static_library("invalidation") { "p2p_invalidator.h", "push_client_channel.cc", "push_client_channel.h", + "registration_manager.cc", + "registration_manager.h", "state_writer.h", "sync_invalidation_listener.cc", "sync_invalidation_listener.h", @@ -58,11 +74,15 @@ static_library("invalidation") { #"//components/gcm_driver", TODO(GYP) "//google_apis", "//components/keyed_service/core", + "//components/signin/core/browser:browser", "//components/pref_registry", #"//components/signin/core/browser", TODO(GYP) "//sync", "//third_party/cacheinvalidation", #'../jingle/jingle.gyp:notifier', TODO(GYP) + + # TODO(sync): Remove this (http://crbug.com/133352); + # "//third_party/cacheinvalidation/src/google/cacheinvalidation:cacheinvalidation_proto_cpp", ] } @@ -78,6 +98,10 @@ static_library("test_support") { "invalidation_service_test_template.h", "invalidator_test_template.cc", "invalidator_test_template.h", + "object_id_invalidation_map_test_util.cc", + "object_id_invalidation_map_test_util.h", + "unacked_invalidation_set_test_util.cc", + "unacked_invalidation_set_test_util.h", ] if (!is_android) { sources += [ @@ -88,6 +112,7 @@ static_library("test_support") { deps = [ "//base", + "//components/keyed_service/core", "//google_apis", "//net", "//sync", diff --git a/components/invalidation/DEPS b/components/invalidation/DEPS index 293bdee..48f688d 100644 --- a/components/invalidation/DEPS +++ b/components/invalidation/DEPS @@ -23,5 +23,4 @@ include_rules = [ # See crbug.com/259559. "+sync/internal_api/public/base", "+sync/internal_api/public/util", - "+sync/notifier", ] diff --git a/components/invalidation/fake_invalidation_handler.h b/components/invalidation/fake_invalidation_handler.h index 611f02c..db38ed1 100644 --- a/components/invalidation/fake_invalidation_handler.h +++ b/components/invalidation/fake_invalidation_handler.h @@ -9,8 +9,8 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "sync/notifier/invalidation_handler.h" -#include "sync/notifier/object_id_invalidation_map.h" +#include "components/invalidation/invalidation_handler.h" +#include "components/invalidation/object_id_invalidation_map.h" namespace syncer { diff --git a/components/invalidation/fake_invalidation_state_tracker.h b/components/invalidation/fake_invalidation_state_tracker.h index 297e6a4..8bd3b0b 100644 --- a/components/invalidation/fake_invalidation_state_tracker.h +++ b/components/invalidation/fake_invalidation_state_tracker.h @@ -6,7 +6,7 @@ #define COMPONENTS_INVALIDATION_FAKE_INVALIDATION_STATE_TRACKER_H_ #include "base/memory/weak_ptr.h" -#include "sync/notifier/invalidation_state_tracker.h" +#include "components/invalidation/invalidation_state_tracker.h" namespace syncer { diff --git a/components/invalidation/fake_invalidator.cc b/components/invalidation/fake_invalidator.cc index 220fe76..00bbc87 100644 --- a/components/invalidation/fake_invalidator.cc +++ b/components/invalidation/fake_invalidator.cc @@ -4,7 +4,7 @@ #include "components/invalidation/fake_invalidator.h" -#include "sync/notifier/object_id_invalidation_map.h" +#include "components/invalidation/object_id_invalidation_map.h" namespace syncer { diff --git a/components/invalidation/fake_invalidator.h b/components/invalidation/fake_invalidator.h index 319a450..e149dbf 100644 --- a/components/invalidation/fake_invalidator.h +++ b/components/invalidation/fake_invalidator.h @@ -9,9 +9,9 @@ #include "base/callback_forward.h" #include "base/compiler_specific.h" +#include "components/invalidation/invalidator.h" #include "components/invalidation/invalidator_registrar.h" -#include "sync/notifier/invalidation_util.h" -#include "sync/notifier/invalidator.h" +#include "sync/internal_api/public/base/invalidation_util.h" namespace syncer { diff --git a/sync/notifier/invalidation_handler.cc b/components/invalidation/invalidation_handler.cc index 8ec9440..bdc4b8f 100644 --- a/sync/notifier/invalidation_handler.cc +++ b/components/invalidation/invalidation_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 "sync/notifier/invalidation_handler.h" +#include "components/invalidation/invalidation_handler.h" namespace syncer { diff --git a/sync/notifier/invalidation_handler.h b/components/invalidation/invalidation_handler.h index 9cd41fe..6180aa3 100644 --- a/sync/notifier/invalidation_handler.h +++ b/components/invalidation/invalidation_handler.h @@ -1,20 +1,20 @@ -// Copyright 2012 The Chromium Authors. All rights reserved. +// 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. -#ifndef SYNC_NOTIFIER_INVALIDATION_HANDLER_H_ -#define SYNC_NOTIFIER_INVALIDATION_HANDLER_H_ +#ifndef COMPONENTS_INVALIDATION_INVALIDATION_HANDLER_H_ +#define COMPONENTS_INVALIDATION_INVALIDATION_HANDLER_H_ #include <string> -#include "sync/base/sync_export.h" +#include "components/invalidation/invalidation_export.h" #include "sync/internal_api/public/base/invalidator_state.h" namespace syncer { class ObjectIdInvalidationMap; -class SYNC_EXPORT InvalidationHandler { +class INVALIDATION_EXPORT InvalidationHandler { public: InvalidationHandler(); @@ -35,4 +35,4 @@ class SYNC_EXPORT InvalidationHandler { } // namespace syncer -#endif // SYNC_NOTIFIER_INVALIDATION_HANDLER_H_ +#endif // COMPONENTS_INVALIDATION_INVALIDATION_HANDLER_H_ diff --git a/components/invalidation/invalidation_logger.cc b/components/invalidation/invalidation_logger.cc index c685ca0..c0e8b41 100644 --- a/components/invalidation/invalidation_logger.cc +++ b/components/invalidation/invalidation_logger.cc @@ -6,8 +6,8 @@ #include "base/memory/scoped_ptr.h" #include "base/values.h" +#include "components/invalidation/invalidation_handler.h" #include "components/invalidation/invalidation_logger_observer.h" -#include "sync/notifier/invalidation_handler.h" namespace invalidation { class InvalidationLoggerObserver; diff --git a/components/invalidation/invalidation_logger.h b/components/invalidation/invalidation_logger.h index afe248c..0fb6be7 100644 --- a/components/invalidation/invalidation_logger.h +++ b/components/invalidation/invalidation_logger.h @@ -10,8 +10,8 @@ #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" +#include "sync/internal_api/public/base/invalidation_util.h" #include "sync/internal_api/public/base/invalidator_state.h" -#include "sync/notifier/invalidation_util.h" namespace base { class DictionaryValue; diff --git a/components/invalidation/invalidation_logger_observer.h b/components/invalidation/invalidation_logger_observer.h index d19e8a5..c5daa2e 100644 --- a/components/invalidation/invalidation_logger_observer.h +++ b/components/invalidation/invalidation_logger_observer.h @@ -6,9 +6,9 @@ #define COMPONENTS_INVALIDATION_INVALIDATION_LOGGER_OBSERVER_H_ #include "base/memory/scoped_ptr.h" +#include "components/invalidation/object_id_invalidation_map.h" +#include "sync/internal_api/public/base/invalidation_util.h" #include "sync/internal_api/public/base/invalidator_state.h" -#include "sync/notifier/invalidation_util.h" -#include "sync/notifier/object_id_invalidation_map.h" namespace base { class DictionaryValue; diff --git a/components/invalidation/invalidation_notifier.cc b/components/invalidation/invalidation_notifier.cc index 016dd5f..daaec4d 100644 --- a/components/invalidation/invalidation_notifier.cc +++ b/components/invalidation/invalidation_notifier.cc @@ -8,10 +8,10 @@ #include "base/logging.h" #include "base/message_loop/message_loop_proxy.h" #include "base/metrics/histogram.h" +#include "components/invalidation/invalidation_handler.h" #include "google/cacheinvalidation/include/invalidation-client-factory.h" #include "jingle/notifier/listener/push_client.h" #include "net/url_request/url_request_context.h" -#include "sync/notifier/invalidation_handler.h" #include "talk/xmpp/jid.h" #include "talk/xmpp/xmppclientsettings.h" diff --git a/components/invalidation/invalidation_notifier.h b/components/invalidation/invalidation_notifier.h index 1f51c6d..c776fb5 100644 --- a/components/invalidation/invalidation_notifier.h +++ b/components/invalidation/invalidation_notifier.h @@ -19,12 +19,12 @@ #include "base/memory/scoped_ptr.h" #include "base/threading/non_thread_safe.h" #include "components/invalidation/invalidation_export.h" +#include "components/invalidation/invalidation_state_tracker.h" +#include "components/invalidation/invalidator.h" #include "components/invalidation/invalidator_registrar.h" #include "components/invalidation/sync_invalidation_listener.h" #include "sync/internal_api/public/base/model_type.h" #include "sync/internal_api/public/util/weak_handle.h" -#include "sync/notifier/invalidation_state_tracker.h" -#include "sync/notifier/invalidator.h" namespace notifier { class PushClient; diff --git a/components/invalidation/invalidation_notifier_unittest.cc b/components/invalidation/invalidation_notifier_unittest.cc index 2927b07..7240c84 100644 --- a/components/invalidation/invalidation_notifier_unittest.cc +++ b/components/invalidation/invalidation_notifier_unittest.cc @@ -8,6 +8,7 @@ #include "base/message_loop/message_loop.h" #include "components/invalidation/fake_invalidation_handler.h" #include "components/invalidation/fake_invalidation_state_tracker.h" +#include "components/invalidation/invalidation_state_tracker.h" #include "components/invalidation/invalidator_test_template.h" #include "components/invalidation/push_client_channel.h" #include "jingle/notifier/base/fake_base_task.h" @@ -16,7 +17,6 @@ #include "net/url_request/url_request_test_util.h" #include "sync/internal_api/public/base/model_type.h" #include "sync/internal_api/public/util/weak_handle.h" -#include "sync/notifier/invalidation_state_tracker.h" #include "testing/gtest/include/gtest/gtest.h" namespace syncer { diff --git a/components/invalidation/invalidation_service.h b/components/invalidation/invalidation_service.h index cc7613d..92ecd3d 100644 --- a/components/invalidation/invalidation_service.h +++ b/components/invalidation/invalidation_service.h @@ -6,8 +6,8 @@ #define COMPONENTS_INVALIDATION_INVALIDATION_SERVICE_H_ #include "base/callback_forward.h" +#include "sync/internal_api/public/base/invalidation_util.h" #include "sync/internal_api/public/base/invalidator_state.h" -#include "sync/notifier/invalidation_util.h" class IdentityProvider; diff --git a/components/invalidation/invalidation_service_test_template.h b/components/invalidation/invalidation_service_test_template.h index fd7e24f..94ef33e 100644 --- a/components/invalidation/invalidation_service_test_template.h +++ b/components/invalidation/invalidation_service_test_template.h @@ -75,12 +75,12 @@ #include "base/compiler_specific.h" #include "components/invalidation/fake_invalidation_handler.h" #include "components/invalidation/invalidation_service.h" +#include "components/invalidation/object_id_invalidation_map.h" +#include "components/invalidation/object_id_invalidation_map_test_util.h" #include "google/cacheinvalidation/include/types.h" #include "google/cacheinvalidation/types.pb.h" #include "sync/internal_api/public/base/ack_handle.h" #include "sync/internal_api/public/base/invalidation.h" -#include "sync/internal_api/public/base/object_id_invalidation_map_test_util.h" -#include "sync/notifier/object_id_invalidation_map.h" #include "testing/gtest/include/gtest/gtest.h" template <typename InvalidatorTestDelegate> diff --git a/sync/notifier/invalidation_state_tracker.cc b/components/invalidation/invalidation_state_tracker.cc index ab3ce17..4bc79df 100644 --- a/sync/notifier/invalidation_state_tracker.cc +++ b/components/invalidation/invalidation_state_tracker.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 "sync/notifier/invalidation_state_tracker.h" +#include "components/invalidation/invalidation_state_tracker.h" namespace syncer { diff --git a/sync/notifier/invalidation_state_tracker.h b/components/invalidation/invalidation_state_tracker.h index 6f4c133..0d8acf8 100644 --- a/sync/notifier/invalidation_state_tracker.h +++ b/components/invalidation/invalidation_state_tracker.h @@ -1,4 +1,4 @@ -// Copyright 2012 The Chromium Authors. All rights reserved. +// 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. // @@ -9,8 +9,8 @@ // - Bootstrap data for the invalidation client. // - Payloads and locally generated ack handles, to support local acking. -#ifndef SYNC_NOTIFIER_INVALIDATION_STATE_TRACKER_H_ -#define SYNC_NOTIFIER_INVALIDATION_STATE_TRACKER_H_ +#ifndef COMPONENTS_INVALIDATION_INVALIDATION_STATE_TRACKER_H_ +#define COMPONENTS_INVALIDATION_INVALIDATION_STATE_TRACKER_H_ #include <map> #include <string> @@ -18,11 +18,11 @@ #include "base/basictypes.h" #include "base/callback_forward.h" #include "base/memory/ref_counted.h" +#include "components/invalidation/invalidation_export.h" +#include "components/invalidation/unacked_invalidation_set.h" #include "google/cacheinvalidation/include/types.h" -#include "sync/base/sync_export.h" #include "sync/internal_api/public/base/invalidation.h" -#include "sync/notifier/invalidation_util.h" -#include "sync/notifier/unacked_invalidation_set.h" +#include "sync/internal_api/public/base/invalidation_util.h" namespace base { class TaskRunner; @@ -30,7 +30,7 @@ class TaskRunner; namespace syncer { -class SYNC_EXPORT InvalidationStateTracker { +class INVALIDATION_EXPORT InvalidationStateTracker { public: InvalidationStateTracker(); virtual ~InvalidationStateTracker(); @@ -61,4 +61,4 @@ class SYNC_EXPORT InvalidationStateTracker { } // namespace syncer -#endif // SYNC_NOTIFIER_INVALIDATION_STATE_TRACKER_H_ +#endif // COMPONENTS_INVALIDATION_INVALIDATION_STATE_TRACKER_H_ diff --git a/sync/notifier/invalidator.cc b/components/invalidation/invalidator.cc index 5508b89..5c92b98 100644 --- a/sync/notifier/invalidator.cc +++ b/components/invalidation/invalidator.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 "sync/notifier/invalidator.h" +#include "components/invalidation/invalidator.h" namespace syncer { diff --git a/sync/notifier/invalidator.h b/components/invalidation/invalidator.h index 7a75fbb..fc4c355 100644 --- a/sync/notifier/invalidator.h +++ b/components/invalidation/invalidator.h @@ -1,4 +1,4 @@ -// Copyright 2012 The Chromium Authors. All rights reserved. +// 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. // @@ -6,21 +6,21 @@ // invalidations for registered object IDs. The corresponding // InvalidationHandler is notifier when such an event occurs. -#ifndef SYNC_NOTIFIER_INVALIDATOR_H_ -#define SYNC_NOTIFIER_INVALIDATOR_H_ +#ifndef COMPONENTS_INVALIDATION_INVALIDATOR_H_ +#define COMPONENTS_INVALIDATION_INVALIDATOR_H_ #include <string> #include "base/callback.h" -#include "sync/base/sync_export.h" +#include "components/invalidation/invalidation_export.h" +#include "sync/internal_api/public/base/invalidation_util.h" #include "sync/internal_api/public/base/invalidator_state.h" #include "sync/internal_api/public/base/model_type.h" -#include "sync/notifier/invalidation_util.h" namespace syncer { class InvalidationHandler; -class SYNC_EXPORT Invalidator { +class INVALIDATION_EXPORT Invalidator { public: Invalidator(); virtual ~Invalidator(); @@ -86,4 +86,4 @@ class SYNC_EXPORT Invalidator { }; } // namespace syncer -#endif // SYNC_NOTIFIER_INVALIDATOR_H_ +#endif // COMPONENTS_INVALIDATION_INVALIDATOR_H_ diff --git a/components/invalidation/invalidator_registrar.cc b/components/invalidation/invalidator_registrar.cc index 4019f2b..80cb7f6 100644 --- a/components/invalidation/invalidator_registrar.cc +++ b/components/invalidation/invalidator_registrar.cc @@ -9,7 +9,7 @@ #include <utility> #include "base/logging.h" -#include "sync/notifier/object_id_invalidation_map.h" +#include "components/invalidation/object_id_invalidation_map.h" namespace syncer { diff --git a/components/invalidation/invalidator_registrar.h b/components/invalidation/invalidator_registrar.h index c7df237..561d29e 100644 --- a/components/invalidation/invalidator_registrar.h +++ b/components/invalidation/invalidator_registrar.h @@ -11,8 +11,8 @@ #include "base/observer_list.h" #include "base/threading/thread_checker.h" #include "components/invalidation/invalidation_export.h" -#include "sync/notifier/invalidation_handler.h" -#include "sync/notifier/invalidation_util.h" +#include "components/invalidation/invalidation_handler.h" +#include "sync/internal_api/public/base/invalidation_util.h" namespace invalidation { class ObjectId; diff --git a/components/invalidation/invalidator_storage.cc b/components/invalidation/invalidator_storage.cc index cb24a4a..13ba4b1 100644 --- a/components/invalidation/invalidator_storage.cc +++ b/components/invalidation/invalidator_storage.cc @@ -15,9 +15,9 @@ #include "base/prefs/pref_service.h" #include "base/values.h" #include "components/invalidation/invalidation_prefs.h" +#include "components/invalidation/unacked_invalidation_set.h" #include "components/pref_registry/pref_registry_syncable.h" #include "google/cacheinvalidation/types.pb.h" -#include "sync/notifier/unacked_invalidation_set.h" namespace { diff --git a/components/invalidation/invalidator_storage.h b/components/invalidation/invalidator_storage.h index f1e330b..a55b120 100644 --- a/components/invalidation/invalidator_storage.h +++ b/components/invalidation/invalidator_storage.h @@ -8,7 +8,7 @@ #include "base/compiler_specific.h" #include "base/macros.h" #include "base/threading/thread_checker.h" -#include "sync/notifier/invalidation_state_tracker.h" +#include "components/invalidation/invalidation_state_tracker.h" class PrefRegistrySimple; class PrefService; diff --git a/components/invalidation/invalidator_test_template.h b/components/invalidation/invalidator_test_template.h index 9b81047..95d011d 100644 --- a/components/invalidation/invalidator_test_template.h +++ b/components/invalidation/invalidator_test_template.h @@ -81,10 +81,10 @@ #include "base/compiler_specific.h" #include "components/invalidation/fake_invalidation_handler.h" #include "components/invalidation/fake_invalidation_state_tracker.h" +#include "components/invalidation/invalidator.h" +#include "components/invalidation/object_id_invalidation_map_test_util.h" #include "google/cacheinvalidation/include/types.h" #include "google/cacheinvalidation/types.pb.h" -#include "sync/internal_api/public/base/object_id_invalidation_map_test_util.h" -#include "sync/notifier/invalidator.h" #include "testing/gtest/include/gtest/gtest.h" namespace syncer { diff --git a/sync/notifier/mock_ack_handler.cc b/components/invalidation/mock_ack_handler.cc index 60300a2..359090c 100644 --- a/sync/notifier/mock_ack_handler.cc +++ b/components/invalidation/mock_ack_handler.cc @@ -1,8 +1,8 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// 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 "sync/notifier/mock_ack_handler.h" +#include "components/invalidation/mock_ack_handler.h" #include "sync/internal_api/public/base/ack_handle.h" #include "sync/internal_api/public/base/invalidation.h" diff --git a/sync/notifier/mock_ack_handler.h b/components/invalidation/mock_ack_handler.h index 08f0539..c22f810 100644 --- a/sync/notifier/mock_ack_handler.h +++ b/components/invalidation/mock_ack_handler.h @@ -1,19 +1,19 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// 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. -#ifndef SYNC_NOTIFIER_MOCK_ACK_HANDLER_H_ -#define SYNC_NOTIFIER_MOCK_ACK_HANDLER_H_ +#ifndef COMPONENTS_INVALIDATION_MOCK_ACK_HANDLER_H_ +#define COMPONENTS_INVALIDATION_MOCK_ACK_HANDLER_H_ #include <map> #include <vector> #include "base/compiler_specific.h" #include "base/memory/weak_ptr.h" -#include "sync/base/sync_export.h" +#include "components/invalidation/invalidation_export.h" +#include "sync/internal_api/public/base/ack_handler.h" +#include "sync/internal_api/public/base/invalidation_util.h" #include "sync/internal_api/public/util/weak_handle.h" -#include "sync/notifier/ack_handler.h" -#include "sync/notifier/invalidation_util.h" namespace syncer { @@ -21,7 +21,7 @@ class Invalidation; // This AckHandler implementation colaborates with the FakeInvalidationService // to enable unit tests to assert that invalidations are being acked properly. -class SYNC_EXPORT MockAckHandler +class INVALIDATION_EXPORT MockAckHandler : public AckHandler, public base::SupportsWeakPtr<MockAckHandler> { public: @@ -80,4 +80,4 @@ class SYNC_EXPORT MockAckHandler } // namespace syncer -#endif // SYNC_NOTIFIER_MOCK_ACK_HANDLER_H_ +#endif // COMPONENTS_INVALIDATION_MOCK_ACK_HANDLER_H_ diff --git a/components/invalidation/non_blocking_invalidator.cc b/components/invalidation/non_blocking_invalidator.cc index 401ae90..95ee59f 100644 --- a/components/invalidation/non_blocking_invalidator.cc +++ b/components/invalidation/non_blocking_invalidator.cc @@ -13,12 +13,12 @@ #include "base/thread_task_runner_handle.h" #include "base/threading/thread.h" #include "components/invalidation/gcm_network_channel_delegate.h" +#include "components/invalidation/invalidation_handler.h" #include "components/invalidation/invalidation_notifier.h" +#include "components/invalidation/object_id_invalidation_map.h" #include "components/invalidation/sync_system_resources.h" #include "jingle/notifier/listener/push_client.h" #include "sync/internal_api/public/util/weak_handle.h" -#include "sync/notifier/invalidation_handler.h" -#include "sync/notifier/object_id_invalidation_map.h" namespace syncer { diff --git a/components/invalidation/non_blocking_invalidator.h b/components/invalidation/non_blocking_invalidator.h index f396796..e2c31c7 100644 --- a/components/invalidation/non_blocking_invalidator.h +++ b/components/invalidation/non_blocking_invalidator.h @@ -16,12 +16,12 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "components/invalidation/invalidation_export.h" +#include "components/invalidation/invalidation_state_tracker.h" +#include "components/invalidation/invalidator.h" #include "components/invalidation/invalidator_registrar.h" +#include "components/invalidation/unacked_invalidation_set.h" #include "jingle/notifier/base/notifier_options.h" #include "sync/internal_api/public/base/invalidator_state.h" -#include "sync/notifier/invalidation_state_tracker.h" -#include "sync/notifier/invalidator.h" -#include "sync/notifier/unacked_invalidation_set.h" namespace base { class SingleThreadTaskRunner; diff --git a/components/invalidation/non_blocking_invalidator_unittest.cc b/components/invalidation/non_blocking_invalidator_unittest.cc index c874b54..331b6c4 100644 --- a/components/invalidation/non_blocking_invalidator_unittest.cc +++ b/components/invalidation/non_blocking_invalidator_unittest.cc @@ -11,11 +11,11 @@ #include "base/run_loop.h" #include "base/threading/thread.h" #include "components/invalidation/fake_invalidation_handler.h" +#include "components/invalidation/invalidation_state_tracker.h" #include "components/invalidation/invalidator_test_template.h" #include "google/cacheinvalidation/types.pb.h" #include "jingle/notifier/base/fake_base_task.h" #include "net/url_request/url_request_test_util.h" -#include "sync/notifier/invalidation_state_tracker.h" #include "testing/gtest/include/gtest/gtest.h" namespace syncer { diff --git a/sync/notifier/object_id_invalidation_map.cc b/components/invalidation/object_id_invalidation_map.cc index 02b5a21..139e8d5 100644 --- a/sync/notifier/object_id_invalidation_map.cc +++ b/components/invalidation/object_id_invalidation_map.cc @@ -1,8 +1,8 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// 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 "sync/notifier/object_id_invalidation_map.h" +#include "components/invalidation/object_id_invalidation_map.h" #include "base/json/json_string_value_serializer.h" diff --git a/sync/notifier/object_id_invalidation_map.h b/components/invalidation/object_id_invalidation_map.h index 3494a62..c2eecb0 100644 --- a/sync/notifier/object_id_invalidation_map.h +++ b/components/invalidation/object_id_invalidation_map.h @@ -1,23 +1,23 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// 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. -#ifndef SYNC_NOTIFIER_OBJECT_ID_INVALIDATION_MAP_H_ -#define SYNC_NOTIFIER_OBJECT_ID_INVALIDATION_MAP_H_ +#ifndef COMPONENTS_INVALIDATION_OBJECT_ID_INVALIDATION_MAP_H_ +#define COMPONENTS_INVALIDATION_OBJECT_ID_INVALIDATION_MAP_H_ #include <map> #include <vector> -#include "sync/base/sync_export.h" +#include "components/invalidation/invalidation_export.h" +#include "components/invalidation/single_object_invalidation_set.h" #include "sync/internal_api/public/base/invalidation.h" -#include "sync/notifier/invalidation_util.h" -#include "sync/notifier/single_object_invalidation_set.h" +#include "sync/internal_api/public/base/invalidation_util.h" namespace syncer { // A set of notifications with some helper methods to organize them by object ID // and version number. -class SYNC_EXPORT ObjectIdInvalidationMap { +class INVALIDATION_EXPORT ObjectIdInvalidationMap { public: // Creates an invalidation map that includes an 'unknown version' // invalidation for each specified ID in |ids|. @@ -73,4 +73,4 @@ class SYNC_EXPORT ObjectIdInvalidationMap { } // namespace syncer -#endif // SYNC_NOTIFIER_OBJECT_ID_INVALIDATION_MAP_H_ +#endif // COMPONENTS_INVALIDATION_OBJECT_ID_INVALIDATION_MAP_H_ diff --git a/sync/internal_api/public/base/object_id_invalidation_map_test_util.cc b/components/invalidation/object_id_invalidation_map_test_util.cc index 777fc69..0711e1e 100644 --- a/sync/internal_api/public/base/object_id_invalidation_map_test_util.cc +++ b/components/invalidation/object_id_invalidation_map_test_util.cc @@ -1,8 +1,8 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// 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 "sync/internal_api/public/base/object_id_invalidation_map_test_util.h" +#include "components/invalidation/object_id_invalidation_map_test_util.h" #include <algorithm> diff --git a/sync/internal_api/public/base/object_id_invalidation_map_test_util.h b/components/invalidation/object_id_invalidation_map_test_util.h index 5d71979..b1e1a93 100644 --- a/sync/internal_api/public/base/object_id_invalidation_map_test_util.h +++ b/components/invalidation/object_id_invalidation_map_test_util.h @@ -1,13 +1,13 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// 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. -#ifndef SYNC_INTERNAL_API_PUBLIC_BASE_OBJECT_ID_INVALIDATION_MAP_TEST_UTIL_H_ -#define SYNC_INTERNAL_API_PUBLIC_BASE_OBJECT_ID_INVALIDATION_MAP_TEST_UTIL_H_ +#ifndef COMPONENTS_INVALIDATION_OBJECT_ID_INVALIDATION_MAP_TEST_UTIL_H_ +#define COMPONENTS_INVALIDATION_OBJECT_ID_INVALIDATION_MAP_TEST_UTIL_H_ // Convince googletest to use the correct overload for PrintTo(). +#include "components/invalidation/object_id_invalidation_map.h" #include "sync/internal_api/public/base/invalidation_test_util.h" -#include "sync/notifier/object_id_invalidation_map.h" #include "testing/gmock/include/gmock/gmock.h" namespace syncer { @@ -17,4 +17,4 @@ namespace syncer { } // namespace syncer -#endif // SYNC_INTERNAL_API_PUBLIC_BASE_OBJECT_ID_INVALIDATION_MAP_TEST_UTIL_H_ +#endif // COMPONENTS_INVALIDATION_OBJECT_ID_INVALIDATION_MAP_TEST_UTIL_H_ diff --git a/sync/notifier/object_id_invalidation_map_unittest.cc b/components/invalidation/object_id_invalidation_map_unittest.cc index 1acd920..34b2e88 100644 --- a/sync/notifier/object_id_invalidation_map_unittest.cc +++ b/components/invalidation/object_id_invalidation_map_unittest.cc @@ -1,8 +1,8 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// 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 "sync/notifier/object_id_invalidation_map.h" +#include "components/invalidation/object_id_invalidation_map.h" #include "google/cacheinvalidation/types.pb.h" diff --git a/components/invalidation/p2p_invalidator.cc b/components/invalidation/p2p_invalidator.cc index 9ea384f..c3f0359 100644 --- a/components/invalidation/p2p_invalidator.cc +++ b/components/invalidation/p2p_invalidator.cc @@ -11,11 +11,11 @@ #include "base/json/json_writer.h" #include "base/logging.h" #include "base/values.h" +#include "components/invalidation/invalidation_handler.h" #include "components/invalidation/notifier_reason_util.h" +#include "components/invalidation/object_id_invalidation_map.h" #include "jingle/notifier/listener/push_client.h" -#include "sync/notifier/invalidation_handler.h" -#include "sync/notifier/invalidation_util.h" -#include "sync/notifier/object_id_invalidation_map.h" +#include "sync/internal_api/public/base/invalidation_util.h" namespace syncer { diff --git a/components/invalidation/p2p_invalidator.h b/components/invalidation/p2p_invalidator.h index 38c8254..683b462 100644 --- a/components/invalidation/p2p_invalidator.h +++ b/components/invalidation/p2p_invalidator.h @@ -17,14 +17,14 @@ #include "base/observer_list.h" #include "base/threading/thread_checker.h" #include "components/invalidation/invalidation_export.h" +#include "components/invalidation/invalidator.h" #include "components/invalidation/invalidator_registrar.h" +#include "components/invalidation/object_id_invalidation_map.h" #include "jingle/notifier/base/notifier_options.h" #include "jingle/notifier/listener/push_client.h" #include "jingle/notifier/listener/push_client_observer.h" #include "sync/internal_api/public/base/invalidator_state.h" #include "sync/internal_api/public/base/model_type.h" -#include "sync/notifier/invalidator.h" -#include "sync/notifier/object_id_invalidation_map.h" namespace notifier { class PushClient; diff --git a/sync/notifier/registration_manager.cc b/components/invalidation/registration_manager.cc index cb852e3..4d153a7 100644 --- a/sync/notifier/registration_manager.cc +++ b/components/invalidation/registration_manager.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// 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 "sync/notifier/registration_manager.h" +#include "components/invalidation/registration_manager.h" #include <algorithm> #include <cstddef> @@ -14,7 +14,7 @@ #include "base/stl_util.h" #include "google/cacheinvalidation/include/invalidation-client.h" #include "google/cacheinvalidation/include/types.h" -#include "sync/notifier/invalidation_util.h" +#include "sync/internal_api/public/base/invalidation_util.h" namespace syncer { diff --git a/sync/notifier/registration_manager.h b/components/invalidation/registration_manager.h index e190a7f..1bf77d5 100644 --- a/sync/notifier/registration_manager.h +++ b/components/invalidation/registration_manager.h @@ -1,12 +1,12 @@ -// Copyright 2012 The Chromium Authors. All rights reserved. +// 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. // // A class that manages the registration of types for server-issued // notifications. -#ifndef SYNC_NOTIFIER_REGISTRATION_MANAGER_H_ -#define SYNC_NOTIFIER_REGISTRATION_MANAGER_H_ +#ifndef COMPONENTS_INVALIDATION_REGISTRATION_MANAGER_H_ +#define COMPONENTS_INVALIDATION_REGISTRATION_MANAGER_H_ #include <map> @@ -15,10 +15,10 @@ #include "base/time/time.h" #include "base/timer/timer.h" // For invalidation::InvalidationListener::RegistrationState. +#include "components/invalidation/invalidation_export.h" #include "google/cacheinvalidation/include/invalidation-listener.h" #include "google/cacheinvalidation/include/types.h" -#include "sync/base/sync_export.h" -#include "sync/notifier/invalidation_util.h" +#include "sync/internal_api/public/base/invalidation_util.h" namespace syncer { @@ -32,7 +32,8 @@ using ::invalidation::InvalidationListener; // implementations include the syncer thread (both versions) and XMPP // retries. The most sophisticated one is URLRequestThrottler; making // that generic should work for everyone. -class SYNC_EXPORT_PRIVATE RegistrationManager : public base::NonThreadSafe { +class INVALIDATION_EXPORT_PRIVATE RegistrationManager + : public base::NonThreadSafe { public: // Constants for exponential backoff (used by tests). static const int kInitialRegistrationDelaySeconds; @@ -184,4 +185,4 @@ class SYNC_EXPORT_PRIVATE RegistrationManager : public base::NonThreadSafe { } // namespace syncer -#endif // SYNC_NOTIFIER_REGISTRATION_MANAGER_H_ +#endif // COMPONENTS_INVALIDATION_REGISTRATION_MANAGER_H_ diff --git a/sync/notifier/registration_manager_unittest.cc b/components/invalidation/registration_manager_unittest.cc index c8328fc..9389e99 100644 --- a/sync/notifier/registration_manager_unittest.cc +++ b/components/invalidation/registration_manager_unittest.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// 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 "sync/notifier/registration_manager.h" +#include "components/invalidation/registration_manager.h" #include <algorithm> #include <cmath> @@ -14,7 +14,7 @@ #include "base/message_loop/message_loop.h" #include "base/stl_util.h" #include "google/cacheinvalidation/include/invalidation-client.h" -#include "sync/notifier/invalidation_util.h" +#include "sync/internal_api/public/base/invalidation_util.h" #include "testing/gtest/include/gtest/gtest.h" namespace syncer { diff --git a/sync/notifier/single_object_invalidation_set.cc b/components/invalidation/single_object_invalidation_set.cc index 93b47ab..6544489 100644 --- a/sync/notifier/single_object_invalidation_set.cc +++ b/components/invalidation/single_object_invalidation_set.cc @@ -1,11 +1,11 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// 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 "sync/notifier/single_object_invalidation_set.h" +#include "components/invalidation/single_object_invalidation_set.h" #include "base/values.h" -#include "sync/notifier/invalidation_util.h" +#include "sync/internal_api/public/base/invalidation_util.h" namespace syncer { diff --git a/sync/notifier/single_object_invalidation_set.h b/components/invalidation/single_object_invalidation_set.h index 579e55f..11ab3e3 100644 --- a/sync/notifier/single_object_invalidation_set.h +++ b/components/invalidation/single_object_invalidation_set.h @@ -1,16 +1,16 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// 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. -#ifndef SYNC_NOTIFIER_SINGLE_OBJECT_INVALIDATION_SET_H_ -#define SYNC_NOTIFIER_SINGLE_OBJECT_INVALIDATION_SET_H_ +#ifndef COMPONENTS_INVALIDATION_SINGLE_OBJECT_INVALIDATION_SET_H_ +#define COMPONENTS_INVALIDATION_SINGLE_OBJECT_INVALIDATION_SET_H_ #include <set> #include "base/memory/scoped_ptr.h" -#include "sync/base/sync_export.h" +#include "components/invalidation/invalidation_export.h" #include "sync/internal_api/public/base/invalidation.h" -#include "sync/notifier/invalidation_util.h" +#include "sync/internal_api/public/base/invalidation_util.h" namespace base { class ListValue; @@ -23,7 +23,7 @@ namespace syncer { // The list is kept sorted by version to make it easier to perform common // operations, like checking for an unknown version invalidation or fetching the // highest invalidation with the highest version number. -class SYNC_EXPORT SingleObjectInvalidationSet { +class INVALIDATION_EXPORT SingleObjectInvalidationSet { public: typedef std::set<Invalidation, InvalidationVersionLessThan> InvalidationsSet; typedef InvalidationsSet::const_iterator const_iterator; @@ -61,4 +61,4 @@ class SYNC_EXPORT SingleObjectInvalidationSet { } // syncer -#endif // SYNC_NOTIFIER_SINGLE_OBJECT_INVALIDATION_SET_H_ +#endif // COMPONENTS_INVALIDATION_SINGLE_OBJECT_INVALIDATION_SET_H_ diff --git a/sync/notifier/single_object_invalidation_set_unittest.cc b/components/invalidation/single_object_invalidation_set_unittest.cc index 3fe074e..34172a1 100644 --- a/sync/notifier/single_object_invalidation_set_unittest.cc +++ b/components/invalidation/single_object_invalidation_set_unittest.cc @@ -1,8 +1,8 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// 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 "sync/notifier/single_object_invalidation_set.h" +#include "components/invalidation/single_object_invalidation_set.h" #include "google/cacheinvalidation/types.pb.h" #include "sync/internal_api/public/base/invalidation_test_util.h" diff --git a/components/invalidation/sync_invalidation_listener.cc b/components/invalidation/sync_invalidation_listener.cc index ea9461c..d15c606 100644 --- a/components/invalidation/sync_invalidation_listener.cc +++ b/components/invalidation/sync_invalidation_listener.cc @@ -11,12 +11,12 @@ #include "base/compiler_specific.h" #include "base/logging.h" #include "base/tracked_objects.h" +#include "components/invalidation/object_id_invalidation_map.h" +#include "components/invalidation/registration_manager.h" #include "google/cacheinvalidation/include/invalidation-client.h" #include "google/cacheinvalidation/include/types.h" #include "jingle/notifier/listener/push_client.h" -#include "sync/notifier/invalidation_util.h" -#include "sync/notifier/object_id_invalidation_map.h" -#include "sync/notifier/registration_manager.h" +#include "sync/internal_api/public/base/invalidation_util.h" namespace { diff --git a/components/invalidation/sync_invalidation_listener.h b/components/invalidation/sync_invalidation_listener.h index 91afc0f..c2fe08c 100644 --- a/components/invalidation/sync_invalidation_listener.h +++ b/components/invalidation/sync_invalidation_listener.h @@ -17,14 +17,14 @@ #include "base/memory/weak_ptr.h" #include "base/threading/non_thread_safe.h" #include "components/invalidation/invalidation_export.h" +#include "components/invalidation/invalidation_state_tracker.h" #include "components/invalidation/state_writer.h" #include "components/invalidation/sync_system_resources.h" +#include "components/invalidation/unacked_invalidation_set.h" #include "google/cacheinvalidation/include/invalidation-listener.h" +#include "sync/internal_api/public/base/ack_handler.h" #include "sync/internal_api/public/base/invalidator_state.h" #include "sync/internal_api/public/util/weak_handle.h" -#include "sync/notifier/ack_handler.h" -#include "sync/notifier/invalidation_state_tracker.h" -#include "sync/notifier/unacked_invalidation_set.h" namespace buzz { class XmppTaskParentInterface; diff --git a/components/invalidation/sync_invalidation_listener_unittest.cc b/components/invalidation/sync_invalidation_listener_unittest.cc index 0399039..8f63cb2 100644 --- a/components/invalidation/sync_invalidation_listener_unittest.cc +++ b/components/invalidation/sync_invalidation_listener_unittest.cc @@ -12,15 +12,15 @@ #include "base/message_loop/message_loop.h" #include "base/stl_util.h" #include "components/invalidation/fake_invalidation_state_tracker.h" +#include "components/invalidation/object_id_invalidation_map.h" #include "components/invalidation/push_client_channel.h" #include "components/invalidation/sync_invalidation_listener.h" +#include "components/invalidation/unacked_invalidation_set_test_util.h" #include "google/cacheinvalidation/include/invalidation-client.h" #include "google/cacheinvalidation/include/types.h" #include "jingle/notifier/listener/fake_push_client.h" +#include "sync/internal_api/public/base/invalidation_util.h" #include "sync/internal_api/public/util/weak_handle.h" -#include "sync/notifier/invalidation_util.h" -#include "sync/notifier/object_id_invalidation_map.h" -#include "sync/notifier/unacked_invalidation_set_test_util.h" #include "testing/gtest/include/gtest/gtest.h" namespace syncer { diff --git a/components/invalidation/sync_system_resources.cc b/components/invalidation/sync_system_resources.cc index dd0cfac..5685dea 100644 --- a/components/invalidation/sync_system_resources.cc +++ b/components/invalidation/sync_system_resources.cc @@ -20,7 +20,7 @@ #include "google/cacheinvalidation/deps/callback.h" #include "google/cacheinvalidation/include/types.h" #include "jingle/notifier/listener/push_client.h" -#include "sync/notifier/invalidation_util.h" +#include "sync/internal_api/public/base/invalidation_util.h" namespace syncer { diff --git a/components/invalidation/ticl_invalidation_service.cc b/components/invalidation/ticl_invalidation_service.cc index 6654fc8..8a63af3 100644 --- a/components/invalidation/ticl_invalidation_service.cc +++ b/components/invalidation/ticl_invalidation_service.cc @@ -9,13 +9,13 @@ #include "components/gcm_driver/gcm_driver.h" #include "components/invalidation/gcm_invalidation_bridge.h" #include "components/invalidation/invalidation_service_util.h" +#include "components/invalidation/invalidator.h" #include "components/invalidation/non_blocking_invalidator.h" +#include "components/invalidation/object_id_invalidation_map.h" #include "google_apis/gaia/gaia_constants.h" #include "net/url_request/url_request_context_getter.h" +#include "sync/internal_api/public/base/invalidation_util.h" #include "sync/internal_api/public/base/invalidator_state.h" -#include "sync/notifier/invalidation_util.h" -#include "sync/notifier/invalidator.h" -#include "sync/notifier/object_id_invalidation_map.h" static const char* kOAuth2Scopes[] = { GaiaConstants::kGoogleTalkOAuth2Scope diff --git a/components/invalidation/ticl_invalidation_service.h b/components/invalidation/ticl_invalidation_service.h index 274e6fe..9de9881 100644 --- a/components/invalidation/ticl_invalidation_service.h +++ b/components/invalidation/ticl_invalidation_service.h @@ -14,6 +14,7 @@ #include "base/threading/non_thread_safe.h" #include "base/timer/timer.h" #include "base/values.h" +#include "components/invalidation/invalidation_handler.h" #include "components/invalidation/invalidation_logger.h" #include "components/invalidation/invalidation_service.h" #include "components/invalidation/invalidator_registrar.h" @@ -22,7 +23,6 @@ #include "google_apis/gaia/identity_provider.h" #include "google_apis/gaia/oauth2_token_service.h" #include "net/base/backoff_entry.h" -#include "sync/notifier/invalidation_handler.h" namespace gcm { class GCMDriver; diff --git a/components/invalidation/ticl_invalidation_service_unittest.cc b/components/invalidation/ticl_invalidation_service_unittest.cc index b9fd878..68a59c8 100644 --- a/components/invalidation/ticl_invalidation_service_unittest.cc +++ b/components/invalidation/ticl_invalidation_service_unittest.cc @@ -13,11 +13,11 @@ #include "components/invalidation/fake_invalidator.h" #include "components/invalidation/gcm_invalidation_bridge.h" #include "components/invalidation/invalidation_service_test_template.h" +#include "components/invalidation/invalidation_state_tracker.h" +#include "components/invalidation/invalidator.h" #include "google_apis/gaia/fake_identity_provider.h" #include "google_apis/gaia/fake_oauth2_token_service.h" #include "net/url_request/url_request_context_getter.h" -#include "sync/notifier/invalidation_state_tracker.h" -#include "sync/notifier/invalidator.h" #include "testing/gtest/include/gtest/gtest.h" namespace invalidation { diff --git a/sync/notifier/unacked_invalidation_set.cc b/components/invalidation/unacked_invalidation_set.cc index 61c4166..0d94a2f 100644 --- a/sync/notifier/unacked_invalidation_set.cc +++ b/components/invalidation/unacked_invalidation_set.cc @@ -1,12 +1,12 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// 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 "sync/notifier/unacked_invalidation_set.h" +#include "components/invalidation/unacked_invalidation_set.h" #include "base/strings/string_number_conversions.h" +#include "components/invalidation/object_id_invalidation_map.h" #include "sync/internal_api/public/base/ack_handle.h" -#include "sync/notifier/object_id_invalidation_map.h" namespace { diff --git a/sync/notifier/unacked_invalidation_set.h b/components/invalidation/unacked_invalidation_set.h index ac83140..6dd2c46 100644 --- a/sync/notifier/unacked_invalidation_set.h +++ b/components/invalidation/unacked_invalidation_set.h @@ -1,16 +1,16 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// 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. -#ifndef SYNC_NOTIFIER_UNACKED_INVALIDATION_SET_H_ -#define SYNC_NOTIFIER_UNACKED_INVALIDATION_SET_H_ +#ifndef COMPONENTS_INVALIDATION_UNACKED_INVALIDATION_SET_H_ +#define COMPONENTS_INVALIDATION_UNACKED_INVALIDATION_SET_H_ #include <vector> -#include "sync/base/sync_export.h" +#include "components/invalidation/invalidation_export.h" #include "sync/internal_api/public/base/invalidation.h" +#include "sync/internal_api/public/base/invalidation_util.h" #include "sync/internal_api/public/util/weak_handle.h" -#include "sync/notifier/invalidation_util.h" namespace base { class DictionaryValue; @@ -29,7 +29,7 @@ class AckHandle; // Manages the set of invalidations that are awaiting local acknowledgement for // a particular ObjectId. This set of invalidations will be persisted across // restarts, though this class is not directly responsible for that. -class SYNC_EXPORT UnackedInvalidationSet { +class INVALIDATION_EXPORT UnackedInvalidationSet { public: static const size_t kMaxBufferedInvalidations; @@ -115,4 +115,4 @@ typedef std::map<invalidation::ObjectId, } // namespace syncer -#endif // SYNC_NOTIFIER_UNACKED_INVALIDATION_SET_H_ +#endif // COMPONENTS_INVALIDATION_UNACKED_INVALIDATION_SET_H_ diff --git a/sync/notifier/unacked_invalidation_set_test_util.cc b/components/invalidation/unacked_invalidation_set_test_util.cc index 8961574c..d3cdd85 100644 --- a/sync/notifier/unacked_invalidation_set_test_util.cc +++ b/components/invalidation/unacked_invalidation_set_test_util.cc @@ -1,11 +1,11 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// 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 "sync/notifier/unacked_invalidation_set_test_util.h" +#include "components/invalidation/unacked_invalidation_set_test_util.h" #include "base/json/json_string_value_serializer.h" -#include "sync/notifier/object_id_invalidation_map.h" +#include "components/invalidation/object_id_invalidation_map.h" #include "testing/gmock/include/gmock/gmock-matchers.h" namespace syncer { diff --git a/sync/notifier/unacked_invalidation_set_test_util.h b/components/invalidation/unacked_invalidation_set_test_util.h index e93726b..4adbb56 100644 --- a/sync/notifier/unacked_invalidation_set_test_util.h +++ b/components/invalidation/unacked_invalidation_set_test_util.h @@ -1,8 +1,11 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// 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 "sync/notifier/unacked_invalidation_set.h" +#ifndef COMPONENTS_INVALIDATION_UNACKED_INVALIDATION_SET_TEST_UTIL_H_ +#define COMPONENTS_INVALIDATION_UNACKED_INVALIDATION_SET_TEST_UTIL_H_ + +#include "components/invalidation/unacked_invalidation_set.h" #include "testing/gmock/include/gmock/gmock-matchers.h" @@ -23,3 +26,5 @@ void PrintTo(const UnackedInvalidationsMap& map, ::std::ostream* os); } // namespace test_util } // namespace syncer + +#endif // COMPONENTS_INVALIDATION_UNACKED_INVALIDATION_SET_TEST_UTIL_H_ diff --git a/sync/notifier/unacked_invalidation_set_unittest.cc b/components/invalidation/unacked_invalidation_set_unittest.cc index d6549ab..0abd189 100644 --- a/sync/notifier/unacked_invalidation_set_unittest.cc +++ b/components/invalidation/unacked_invalidation_set_unittest.cc @@ -1,13 +1,13 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// 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 "sync/notifier/unacked_invalidation_set.h" +#include "components/invalidation/unacked_invalidation_set.h" #include "base/json/json_string_value_serializer.h" -#include "sync/notifier/object_id_invalidation_map.h" -#include "sync/notifier/single_object_invalidation_set.h" -#include "sync/notifier/unacked_invalidation_set_test_util.h" +#include "components/invalidation/object_id_invalidation_map.h" +#include "components/invalidation/single_object_invalidation_set.h" +#include "components/invalidation/unacked_invalidation_set_test_util.h" #include "testing/gtest/include/gtest/gtest.h" namespace syncer { diff --git a/components/sync_driver/sync_prefs.h b/components/sync_driver/sync_prefs.h index 3400824..bb66301 100644 --- a/components/sync_driver/sync_prefs.h +++ b/components/sync_driver/sync_prefs.h @@ -13,7 +13,6 @@ #include "base/threading/non_thread_safe.h" #include "base/time/time.h" #include "sync/internal_api/public/base/model_type.h" -#include "sync/notifier/invalidation_state_tracker.h" class PrefService; class ProfileIOData; diff --git a/google_apis/google_apis.gyp b/google_apis/google_apis.gyp index 41408cc..73b2d11 100644 --- a/google_apis/google_apis.gyp +++ b/google_apis/google_apis.gyp @@ -18,6 +18,7 @@ ], 'dependencies': [ '../base/base.gyp:base', + '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../crypto/crypto.gyp:crypto', '../net/net.gyp:net', '../third_party/libxml/libxml.gyp:libxml', diff --git a/sync/internal_api/public/DEPS b/sync/internal_api/public/DEPS index b9d4591..85615c7 100644 --- a/sync/internal_api/public/DEPS +++ b/sync/internal_api/public/DEPS @@ -3,7 +3,6 @@ include_rules = [ "+sync/api", "+sync/base", "+sync/internal_api/public", - "+sync/notifier", "+sync/protocol", # TODO(tim): Remove. Bug 131130 diff --git a/sync/internal_api/public/base/DEPS b/sync/internal_api/public/base/DEPS index 9d46a8a..ef4f96b 100644 --- a/sync/internal_api/public/base/DEPS +++ b/sync/internal_api/public/base/DEPS @@ -7,6 +7,5 @@ include_rules = [ "+sync/base", "+sync/internal_api/public/base", "+sync/internal_api/public/util", - "+sync/notifier", "+sync/protocol", ] diff --git a/sync/notifier/ack_handler.cc b/sync/internal_api/public/base/ack_handler.cc index 3b31b2b..ffed173 100644 --- a/sync/notifier/ack_handler.cc +++ b/sync/internal_api/public/base/ack_handler.cc @@ -1,8 +1,8 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// 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 "sync/notifier/ack_handler.h" +#include "sync/internal_api/public/base/ack_handler.h" #include "sync/internal_api/public/base/invalidation.h" diff --git a/sync/notifier/ack_handler.h b/sync/internal_api/public/base/ack_handler.h index f1fc16f..7fcd6a4 100644 --- a/sync/notifier/ack_handler.h +++ b/sync/internal_api/public/base/ack_handler.h @@ -1,9 +1,9 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// 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. -#ifndef SYNC_NOTIFIER_ACK_HANDLER_H_ -#define SYNC_NOTIFIER_ACK_HANDLER_H_ +#ifndef SYNC_INTERNAL_API_PUBLIC_BASE_ACK_HANDLER_H_ +#define SYNC_INTERNAL_API_PUBLIC_BASE_ACK_HANDLER_H_ #include <vector> @@ -39,4 +39,4 @@ class SYNC_EXPORT AckHandler { } // namespace syncer -#endif // SYNC_NOTIFIER_ACK_HANDLER_H_ +#endif // SYNC_INTERNAL_API_PUBLIC_BASE_ACK_HANDLER_H_ diff --git a/sync/internal_api/public/base/invalidation.cc b/sync/internal_api/public/base/invalidation.cc index e6a64be..14114fa 100644 --- a/sync/internal_api/public/base/invalidation.cc +++ b/sync/internal_api/public/base/invalidation.cc @@ -10,8 +10,8 @@ #include "base/rand_util.h" #include "base/strings/string_number_conversions.h" #include "base/values.h" -#include "sync/notifier/ack_handler.h" -#include "sync/notifier/invalidation_util.h" +#include "sync/internal_api/public/base/ack_handler.h" +#include "sync/internal_api/public/base/invalidation_util.h" namespace syncer { @@ -97,6 +97,16 @@ scoped_ptr<Invalidation> Invalidation::InitFromValue( Invalidation::~Invalidation() {} +Invalidation& Invalidation::operator=(const Invalidation& other) { + id_ = other.id_; + is_unknown_version_ = other.is_unknown_version_; + version_ = other.version_; + payload_ = other.payload_; + ack_handle_ = other.ack_handle_; + ack_handler_ = other.ack_handler_; + return *this; +} + invalidation::ObjectId Invalidation::object_id() const { return id_; } diff --git a/sync/internal_api/public/base/invalidation.h b/sync/internal_api/public/base/invalidation.h index 309eb7d..7be82f8 100644 --- a/sync/internal_api/public/base/invalidation.h +++ b/sync/internal_api/public/base/invalidation.h @@ -35,9 +35,15 @@ class SYNC_EXPORT Invalidation { static scoped_ptr<Invalidation> InitFromValue( const base::DictionaryValue& value); - Invalidation(const Invalidation& other); ~Invalidation(); + // We define the copy and assignment operators explicitly for now, even + // though the implicit definitions would be good enough for our purposes. + // This is to work around some linker issues in the Windows build. See + // http://crbug.com/394549. + Invalidation(const Invalidation& other); + Invalidation& operator=(const Invalidation& other); + // Compares two invalidations. The comparison ignores ack-tracking state. bool Equals(const Invalidation& other) const; diff --git a/sync/notifier/invalidation_util.cc b/sync/internal_api/public/base/invalidation_util.cc index 27acd38..dfa43bd 100644 --- a/sync/notifier/invalidation_util.cc +++ b/sync/internal_api/public/base/invalidation_util.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// 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 "sync/notifier/invalidation_util.h" +#include "sync/internal_api/public/base/invalidation_util.h" #include <ostream> #include <sstream> diff --git a/sync/notifier/invalidation_util.h b/sync/internal_api/public/base/invalidation_util.h index eac4bac..5951ad8 100644 --- a/sync/notifier/invalidation_util.h +++ b/sync/internal_api/public/base/invalidation_util.h @@ -1,11 +1,11 @@ -// Copyright 2012 The Chromium Authors. All rights reserved. +// 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. // // Various utilities for dealing with invalidation data types. -#ifndef SYNC_NOTIFIER_INVALIDATION_UTIL_H_ -#define SYNC_NOTIFIER_INVALIDATION_UTIL_H_ +#ifndef SYNC_INTERNAL_API_PUBLIC_BASE_INVALIDATION_UTIL_H_ +#define SYNC_INTERNAL_API_PUBLIC_BASE_INVALIDATION_UTIL_H_ #include <iosfwd> #include <map> @@ -74,4 +74,4 @@ std::string InvalidationToString( } // namespace syncer -#endif // SYNC_NOTIFIER_INVALIDATION_UTIL_H_ +#endif // SYNC_INTERNAL_API_PUBLIC_BASE_INVALIDATION_UTIL_H_ diff --git a/sync/notifier/DEPS b/sync/notifier/DEPS deleted file mode 100644 index 0856674..0000000 --- a/sync/notifier/DEPS +++ /dev/null @@ -1,7 +0,0 @@ -include_rules = [ - "+google/cacheinvalidation", - - "+sync/base", - "+sync/internal_api/public/base", - "+sync/internal_api/public/util", -] diff --git a/sync/sync.gyp b/sync/sync.gyp index 6a14e84..3a840e1 100644 --- a/sync/sync.gyp +++ b/sync/sync.gyp @@ -16,10 +16,10 @@ # Notes: # 1) In static mode, the public 'sync' target has a target type of 'none', # and is composed of the static library targets 'sync_api', 'sync_core', - # 'sync_internal_api', 'sync_notifier', and 'sync_proto'. + # 'sync_internal_api', and 'sync_proto'. # 2) In component mode, we build the public 'sync' target into a single DLL, # which includes the contents of sync_api.gypi, sync_core.gypi, - # sync_internal_api.gypi, sync_notifier.gypi, and sync_proto.gypi. + # sync_internal_api.gypi, and sync_proto.gypi. # 3) All external targets that depend on anything in sync/ must simply # declare a dependency on 'sync.gyp:sync' ['component=="static_library"', { @@ -32,11 +32,9 @@ 'sync_api', 'sync_core', 'sync_internal_api', - 'sync_notifier', 'sync_proto', ], 'export_dependent_settings': [ - 'sync_notifier', 'sync_proto', ], }, @@ -64,11 +62,9 @@ 'sync_core.gypi', ], 'dependencies': [ - 'sync_notifier', 'sync_proto', ], 'export_dependent_settings': [ - 'sync_notifier', 'sync_proto', ], }, @@ -83,7 +79,6 @@ ], 'dependencies': [ 'sync_core', - 'sync_notifier', 'sync_proto', ], 'export_dependent_settings': [ @@ -92,16 +87,6 @@ ], }, - # The sync notifications library. - { - 'target_name': 'sync_notifier', - 'type': 'static_library', - 'variables': { 'enable_wexit_time_destructors': 1, }, - 'includes': [ - 'sync_notifier.gypi', - ], - }, - # The sync protocol buffer library. { # GN version: //sync/protocol @@ -125,7 +110,6 @@ 'sync_api.gypi', 'sync_core.gypi', 'sync_internal_api.gypi', - 'sync_notifier.gypi', 'sync_proto.gypi', ], }, diff --git a/sync/sync_internal_api.gypi b/sync/sync_internal_api.gypi index 7d92f68..5cff4fe 100644 --- a/sync/sync_internal_api.gypi +++ b/sync/sync_internal_api.gypi @@ -12,9 +12,13 @@ 'dependencies': [ '../base/base.gyp:base', '../net/net.gyp:net', + '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation', '../third_party/zlib/zlib.gyp:zlib', '../url/url.gyp:url_lib', ], + 'export_dependent_settings': [ + '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation', + ], 'sources': [ 'internal_api/attachments/attachment_downloader_impl.cc', 'internal_api/attachments/attachment_uploader_impl.cc', @@ -54,6 +58,8 @@ 'internal_api/public/attachments/fake_attachment_uploader.h', 'internal_api/public/base/ack_handle.cc', 'internal_api/public/base/ack_handle.h', + 'internal_api/public/base/ack_handler.cc', + 'internal_api/public/base/ack_handler.h', 'internal_api/public/base/attachment_id_proto.cc', 'internal_api/public/base/attachment_id_proto.h', 'internal_api/public/base/cancelation_observer.cc', @@ -66,6 +72,8 @@ 'internal_api/public/base/invalidation.h', 'internal_api/public/base/invalidation_interface.cc', 'internal_api/public/base/invalidation_interface.h', + 'internal_api/public/base/invalidation_util.cc', + 'internal_api/public/base/invalidation_util.h', 'internal_api/public/base/invalidator_state.cc', 'internal_api/public/base/invalidator_state.h', 'internal_api/public/base/model_type.h', diff --git a/sync/sync_notifier.gypi b/sync/sync_notifier.gypi deleted file mode 100644 index f0f3eee..0000000 --- a/sync/sync_notifier.gypi +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 2013 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_dirs': [ - '..', - ], - 'defines': [ - 'SYNC_IMPLEMENTATION', - ], - 'dependencies': [ - '../base/base.gyp:base', - '../jingle/jingle.gyp:jingle_glue', - '../jingle/jingle.gyp:notifier', - '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation', - # TODO(akalin): Remove this (http://crbug.com/133352). - '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp', - '../third_party/libjingle/libjingle.gyp:libjingle', - ], - 'export_dependent_settings': [ - '../jingle/jingle.gyp:notifier', - '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation', - ], - 'sources': [ - 'notifier/ack_handler.cc', - 'notifier/ack_handler.h', - 'notifier/invalidation_handler.cc', - 'notifier/invalidation_handler.h', - 'notifier/invalidation_state_tracker.cc', - 'notifier/invalidation_state_tracker.h', - 'notifier/invalidation_util.cc', - 'notifier/invalidation_util.h', - 'notifier/unacked_invalidation_set.cc', - 'notifier/unacked_invalidation_set.h', - 'notifier/invalidator.cc', - 'notifier/invalidator.h', - 'notifier/mock_ack_handler.cc', - 'notifier/mock_ack_handler.h', - 'notifier/object_id_invalidation_map.cc', - 'notifier/object_id_invalidation_map.h', - 'notifier/single_object_invalidation_set.cc', - 'notifier/single_object_invalidation_set.h', - ], - 'conditions': [ - ['OS != "android"', { - 'sources': [ - 'notifier/registration_manager.cc', - 'notifier/registration_manager.h', - ], - }], - ], -} diff --git a/sync/sync_tests.gypi b/sync/sync_tests.gypi index 1cff9bf..9802ce3 100644 --- a/sync/sync_tests.gypi +++ b/sync/sync_tests.gypi @@ -154,34 +154,6 @@ ], }, - # Test support files for the 'sync_notifier' target. - { - 'target_name': 'test_support_sync_notifier', - 'type': 'static_library', - 'include_dirs': [ - '..', - ], - 'defines': [ - 'SYNC_TEST' - ], - 'dependencies': [ - '../testing/gmock.gyp:gmock', - '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp', - 'sync', - ], - 'export_dependent_settings': [ - '../testing/gmock.gyp:gmock', - '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp', - 'sync', - ], - 'sources': [ - 'notifier/unacked_invalidation_set_test_util.cc', - 'notifier/unacked_invalidation_set_test_util.h', - 'internal_api/public/base/object_id_invalidation_map_test_util.h', - 'internal_api/public/base/object_id_invalidation_map_test_util.cc', - ], - }, - # Test support files for the 'sync_internal_api' target. { 'target_name': 'test_support_sync_internal_api', @@ -196,11 +168,13 @@ 'dependencies': [ '../base/base.gyp:base', '../testing/gtest.gyp:gtest', + '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation', 'sync', 'test_support_sync_core', ], 'export_dependent_settings': [ '../testing/gtest.gyp:gtest', + '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation', 'sync', 'test_support_sync_core', ], @@ -343,58 +317,6 @@ }, }, - # 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', - '../google_apis/google_apis.gyp:google_apis', - '../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', - 'test_support_sync_notifier', - ], - # Propagate all dependencies since the actual compilation - # happens in the dependents. - 'export_dependent_settings': [ - '../base/base.gyp:base', - '../google_apis/google_apis.gyp:google_apis', - '../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', - 'test_support_sync_notifier', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '..', - ], - 'conditions': [ - ['OS != "android"', { - 'sources': [ - 'notifier/object_id_invalidation_map_unittest.cc', - 'notifier/registration_manager_unittest.cc', - 'notifier/single_object_invalidation_set_unittest.cc', - 'notifier/unacked_invalidation_set_unittest.cc', - ], - }], - ], - }, - }, - # Unit tests for the 'sync_internal_api' 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 @@ -406,6 +328,7 @@ 'suppress_wildcard': 1, 'dependencies': [ '../base/base.gyp:base', + '../google_apis/google_apis.gyp:google_apis', '../google_apis/google_apis.gyp:google_apis_test_support', '../net/net.gyp:net', '../net/net.gyp:net_test_support', @@ -418,6 +341,8 @@ # happens in the dependents. 'export_dependent_settings': [ '../base/base.gyp:base', + '../google_apis/google_apis.gyp:google_apis', + '../google_apis/google_apis.gyp:google_apis_test_support', '../net/net.gyp:net', '../net/net.gyp:net_test_support', '../testing/gmock.gyp:gmock', @@ -515,7 +440,8 @@ 'sync_api_tests', 'sync_core_tests', 'sync_internal_api_tests', - 'sync_notifier_tests', + 'sync', + '../third_party/protobuf/protobuf.gyp:protobuf_lite', ], 'conditions': [ # TODO(akalin): This is needed because histogram.cc uses diff --git a/sync/tools/DEPS b/sync/tools/DEPS index ac34026..ec5c93e 100644 --- a/sync/tools/DEPS +++ b/sync/tools/DEPS @@ -4,7 +4,6 @@ include_rules = [ "+net", "+sync/internal_api/public", "+sync/js", - "+sync/notifier", # TODO(akalin): Remove this when we use the system encryptor. "+sync/test/fake_encryptor.h", ] diff --git a/sync/tools/null_invalidation_state_tracker.cc b/sync/tools/null_invalidation_state_tracker.cc index d7f949f..24e8655 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/notifier/invalidation_util.h" +#include "sync/internal_api/public/base/invalidation_util.h" namespace syncer { diff --git a/sync/tools/null_invalidation_state_tracker.h b/sync/tools/null_invalidation_state_tracker.h index a08fe7d..140ee3f 100644 --- a/sync/tools/null_invalidation_state_tracker.h +++ b/sync/tools/null_invalidation_state_tracker.h @@ -7,7 +7,7 @@ #include "base/compiler_specific.h" #include "base/memory/weak_ptr.h" -#include "sync/notifier/invalidation_state_tracker.h" +#include "components/invalidation/invalidation_state_tracker.h" namespace syncer { diff --git a/sync/tools/sync_client.cc b/sync/tools/sync_client.cc index 6813823..ca34f85 100644 --- a/sync/tools/sync_client.cc +++ b/sync/tools/sync_client.cc @@ -21,6 +21,7 @@ #include "base/task_runner.h" #include "base/threading/thread.h" #include "components/invalidation/non_blocking_invalidator.h" +#include "components/invalidation/object_id_invalidation_map.h" #include "jingle/notifier/base/notification_method.h" #include "jingle/notifier/base/notifier_options.h" #include "net/base/host_port_pair.h" @@ -42,7 +43,6 @@ #include "sync/internal_api/public/util/weak_handle.h" #include "sync/js/js_event_details.h" #include "sync/js/js_event_handler.h" -#include "sync/notifier/object_id_invalidation_map.h" #include "sync/test/fake_encryptor.h" #include "sync/tools/null_invalidation_state_tracker.h" diff --git a/sync/tools/sync_listen_notifications.cc b/sync/tools/sync_listen_notifications.cc index 7a3279b..996647f 100644 --- a/sync/tools/sync_listen_notifications.cc +++ b/sync/tools/sync_listen_notifications.cc @@ -15,7 +15,11 @@ #include "base/message_loop/message_loop.h" #include "base/rand_util.h" #include "base/threading/thread.h" +#include "components/invalidation/invalidation_handler.h" +#include "components/invalidation/invalidation_state_tracker.h" +#include "components/invalidation/invalidator.h" #include "components/invalidation/non_blocking_invalidator.h" +#include "components/invalidation/object_id_invalidation_map.h" #include "jingle/notifier/base/notification_method.h" #include "jingle/notifier/base/notifier_options.h" #include "net/base/host_port_pair.h" @@ -23,12 +27,8 @@ #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/notifier/invalidation_handler.h" -#include "sync/notifier/invalidation_state_tracker.h" -#include "sync/notifier/invalidation_util.h" -#include "sync/notifier/invalidator.h" -#include "sync/notifier/object_id_invalidation_map.h" #include "sync/tools/null_invalidation_state_tracker.h" #if defined(OS_MACOSX) diff --git a/sync/tools/sync_tools.gyp b/sync/tools/sync_tools.gyp index 20ca8ec..e6797b5 100644 --- a/sync/tools/sync_tools.gyp +++ b/sync/tools/sync_tools.gyp @@ -19,6 +19,7 @@ ], 'dependencies': [ '../../base/base.gyp:base', + '../../components/components.gyp:invalidation', '../sync.gyp:sync', ], 'export_dependent_settings': [ |