diff options
| -rw-r--r-- | chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/invalidation/fake_invalidation_service.h | 2 | ||||
| -rw-r--r-- | chrome/browser/invalidation/gcm_invalidation_bridge.h | 2 | ||||
| -rw-r--r-- | chrome/browser/invalidation/invalidation_service_android.h | 2 | ||||
| -rw-r--r-- | chrome/browser/invalidation/invalidation_service_android_unittest.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/invalidation/invalidation_service_test_template.h | 2 | ||||
| -rw-r--r-- | chrome/browser/invalidation/ticl_invalidation_service.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/invalidation/ticl_invalidation_service.h | 2 | ||||
| -rw-r--r-- | chrome/browser/invalidation/ticl_invalidation_service_unittest.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/invalidation/ticl_profile_settings_provider_unittest.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/sync/glue/sync_backend_host_impl_unittest.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/sync/test/integration/fake_server_invalidation_service.h | 2 | ||||
| -rw-r--r-- | chrome/browser/sync/test/integration/sync_test.cc | 2 | ||||
| -rw-r--r-- | chrome/chrome_tests_unit.gypi | 1 | ||||
| -rw-r--r-- | components/components_tests.gyp | 14 | ||||
| -rw-r--r-- | components/invalidation.gypi | 50 | ||||
| -rw-r--r-- | components/invalidation/DEPS | 11 | ||||
| -rw-r--r-- | components/invalidation/invalidation_export.h | 21 | ||||
| -rw-r--r-- | components/invalidation/invalidation_logger.h | 2 | ||||
| -rw-r--r-- | components/invalidation/invalidation_logger_observer.h | 2 | ||||
| -rw-r--r-- | components/invalidation/invalidation_service.h | 2 | ||||
| -rw-r--r-- | components/invalidation/notifier_reason_util.h | 22 | ||||
| -rw-r--r-- | components/invalidation/p2p_invalidation_service.cc | 2 | ||||
| -rw-r--r-- | components/invalidation/p2p_invalidation_service.h | 2 | ||||
| -rw-r--r-- | sync/internal_api/public/base/invalidator_state.cc | 25 | ||||
| -rw-r--r-- | sync/internal_api/public/test/fake_sync_manager.h | 4 | ||||
| -rw-r--r-- | sync/internal_api/sync_manager_impl.h | 2 | ||||
| -rw-r--r-- | sync/internal_api/sync_manager_impl_unittest.cc | 1 | ||||
| -rw-r--r-- | sync/internal_api/test/fake_sync_manager.cc | 2 | ||||
| -rw-r--r-- | sync/notifier/DEPS | 13 | ||||
| -rw-r--r-- | sync/notifier/fake_invalidation_handler.cc (renamed from components/invalidation/fake_invalidation_handler.cc) | 2 | ||||
| -rw-r--r-- | sync/notifier/fake_invalidation_handler.h (renamed from components/invalidation/fake_invalidation_handler.h) | 6 | ||||
| -rw-r--r-- | sync/notifier/fake_invalidation_state_tracker.cc (renamed from components/invalidation/fake_invalidation_state_tracker.cc) | 2 | ||||
| -rw-r--r-- | sync/notifier/fake_invalidation_state_tracker.h (renamed from components/invalidation/fake_invalidation_state_tracker.h) | 6 | ||||
| -rw-r--r-- | sync/notifier/fake_invalidator.cc (renamed from components/invalidation/fake_invalidator.cc) | 2 | ||||
| -rw-r--r-- | sync/notifier/fake_invalidator.h (renamed from components/invalidation/fake_invalidator.h) | 8 | ||||
| -rw-r--r-- | sync/notifier/fake_invalidator_unittest.cc (renamed from components/invalidation/fake_invalidator_unittest.cc) | 4 | ||||
| -rw-r--r-- | sync/notifier/gcm_network_channel.cc (renamed from components/invalidation/gcm_network_channel.cc) | 4 | ||||
| -rw-r--r-- | sync/notifier/gcm_network_channel.h (renamed from components/invalidation/gcm_network_channel.h) | 14 | ||||
| -rw-r--r-- | sync/notifier/gcm_network_channel_delegate.h (renamed from components/invalidation/gcm_network_channel_delegate.h) | 6 | ||||
| -rw-r--r-- | sync/notifier/gcm_network_channel_unittest.cc (renamed from components/invalidation/gcm_network_channel_unittest.cc) | 2 | ||||
| -rw-r--r-- | sync/notifier/invalidation_handler.h | 2 | ||||
| -rw-r--r-- | sync/notifier/invalidation_notifier.cc (renamed from components/invalidation/invalidation_notifier.cc) | 2 | ||||
| -rw-r--r-- | sync/notifier/invalidation_notifier.h (renamed from components/invalidation/invalidation_notifier.h) | 14 | ||||
| -rw-r--r-- | sync/notifier/invalidation_notifier_unittest.cc (renamed from components/invalidation/invalidation_notifier_unittest.cc) | 10 | ||||
| -rw-r--r-- | sync/notifier/invalidation_state_tracker.cc | 13 | ||||
| -rw-r--r-- | sync/notifier/invalidation_state_tracker.h | 4 | ||||
| -rw-r--r-- | sync/notifier/invalidator.h | 2 | ||||
| -rw-r--r-- | sync/notifier/invalidator_registrar.cc (renamed from components/invalidation/invalidator_registrar.cc) | 2 | ||||
| -rw-r--r-- | sync/notifier/invalidator_registrar.h (renamed from components/invalidation/invalidator_registrar.h) | 10 | ||||
| -rw-r--r-- | sync/notifier/invalidator_registrar_unittest.cc (renamed from components/invalidation/invalidator_registrar_unittest.cc) | 6 | ||||
| -rw-r--r-- | sync/notifier/invalidator_state.cc (renamed from components/invalidation/notifier_reason_util.cc) | 16 | ||||
| -rw-r--r-- | sync/notifier/invalidator_state.h (renamed from sync/internal_api/public/base/invalidator_state.h) | 14 | ||||
| -rw-r--r-- | sync/notifier/invalidator_test_template.cc (renamed from components/invalidation/invalidator_test_template.cc) | 2 | ||||
| -rw-r--r-- | sync/notifier/invalidator_test_template.h (renamed from components/invalidation/invalidator_test_template.h) | 10 | ||||
| -rw-r--r-- | sync/notifier/non_blocking_invalidator.cc (renamed from components/invalidation/non_blocking_invalidator.cc) | 8 | ||||
| -rw-r--r-- | sync/notifier/non_blocking_invalidator.h (renamed from components/invalidation/non_blocking_invalidator.h) | 14 | ||||
| -rw-r--r-- | sync/notifier/non_blocking_invalidator_unittest.cc (renamed from components/invalidation/non_blocking_invalidator_unittest.cc) | 6 | ||||
| -rw-r--r-- | sync/notifier/p2p_invalidator.cc (renamed from components/invalidation/p2p_invalidator.cc) | 3 | ||||
| -rw-r--r-- | sync/notifier/p2p_invalidator.h (renamed from components/invalidation/p2p_invalidator.h) | 24 | ||||
| -rw-r--r-- | sync/notifier/p2p_invalidator_unittest.cc (renamed from components/invalidation/p2p_invalidator_unittest.cc) | 8 | ||||
| -rw-r--r-- | sync/notifier/push_client_channel.cc (renamed from components/invalidation/push_client_channel.cc) | 3 | ||||
| -rw-r--r-- | sync/notifier/push_client_channel.h (renamed from components/invalidation/push_client_channel.h) | 12 | ||||
| -rw-r--r-- | sync/notifier/push_client_channel_unittest.cc (renamed from components/invalidation/push_client_channel_unittest.cc) | 2 | ||||
| -rw-r--r-- | sync/notifier/state_writer.h (renamed from components/invalidation/state_writer.h) | 10 | ||||
| -rw-r--r-- | sync/notifier/sync_invalidation_listener.cc (renamed from components/invalidation/sync_invalidation_listener.cc) | 2 | ||||
| -rw-r--r-- | sync/notifier/sync_invalidation_listener.h (renamed from components/invalidation/sync_invalidation_listener.h) | 18 | ||||
| -rw-r--r-- | sync/notifier/sync_invalidation_listener_unittest.cc (renamed from components/invalidation/sync_invalidation_listener_unittest.cc) | 6 | ||||
| -rw-r--r-- | sync/notifier/sync_system_resources.cc (renamed from components/invalidation/sync_system_resources.cc) | 8 | ||||
| -rw-r--r-- | sync/notifier/sync_system_resources.h (renamed from components/invalidation/sync_system_resources.h) | 16 | ||||
| -rw-r--r-- | sync/notifier/sync_system_resources_unittest.cc (renamed from components/invalidation/sync_system_resources_unittest.cc) | 6 | ||||
| -rw-r--r-- | sync/notifier/unacked_invalidation_set.cc | 1 | ||||
| -rw-r--r-- | sync/sync_internal_api.gypi | 2 | ||||
| -rw-r--r-- | sync/sync_notifier.gypi | 21 | ||||
| -rw-r--r-- | sync/sync_tests.gypi | 17 | ||||
| -rw-r--r-- | sync/tools/DEPS | 1 | ||||
| -rw-r--r-- | sync/tools/sync_client.cc | 2 | ||||
| -rw-r--r-- | sync/tools/sync_listen_notifications.cc | 2 | ||||
| -rw-r--r-- | sync/tools/sync_tools.gyp | 2 |
79 files changed, 241 insertions, 323 deletions
diff --git a/chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc b/chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc index d974484..a1993a9 100644 --- a/chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc +++ b/chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc @@ -16,10 +16,10 @@ #include "chrome/browser/ui/browser.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/base/ui_test_utils.h" -#include "components/invalidation/fake_invalidator.h" #include "components/invalidation/invalidation_service.h" #include "google/cacheinvalidation/types.pb.h" #include "sync/internal_api/public/base/invalidation.h" +#include "sync/notifier/fake_invalidator.h" #include "testing/gmock/include/gmock/gmock.h" using ::testing::SaveArg; diff --git a/chrome/browser/invalidation/fake_invalidation_service.h b/chrome/browser/invalidation/fake_invalidation_service.h index cc59b1c..9641c1f 100644 --- a/chrome/browser/invalidation/fake_invalidation_service.h +++ b/chrome/browser/invalidation/fake_invalidation_service.h @@ -12,8 +12,8 @@ #include "base/callback_forward.h" #include "chrome/browser/signin/fake_profile_oauth2_token_service.h" #include "components/invalidation/invalidation_service.h" -#include "components/invalidation/invalidator_registrar.h" #include "google_apis/gaia/fake_identity_provider.h" +#include "sync/notifier/invalidator_registrar.h" #include "sync/notifier/mock_ack_handler.h" namespace content { diff --git a/chrome/browser/invalidation/gcm_invalidation_bridge.h b/chrome/browser/invalidation/gcm_invalidation_bridge.h index 8a92393..e8ad7ef 100644 --- a/chrome/browser/invalidation/gcm_invalidation_bridge.h +++ b/chrome/browser/invalidation/gcm_invalidation_bridge.h @@ -10,9 +10,9 @@ #include "base/memory/weak_ptr.h" #include "base/threading/non_thread_safe.h" #include "components/gcm_driver/gcm_app_handler.h" -#include "components/invalidation/gcm_network_channel_delegate.h" #include "google_apis/gaia/oauth2_token_service.h" #include "google_apis/gcm/gcm_client.h" +#include "sync/notifier/gcm_network_channel_delegate.h" class IdentityProvider; diff --git a/chrome/browser/invalidation/invalidation_service_android.h b/chrome/browser/invalidation/invalidation_service_android.h index 63af3fc..46da354 100644 --- a/chrome/browser/invalidation/invalidation_service_android.h +++ b/chrome/browser/invalidation/invalidation_service_android.h @@ -11,10 +11,10 @@ #include "base/threading/non_thread_safe.h" #include "components/invalidation/invalidation_logger.h" #include "components/invalidation/invalidation_service.h" -#include "components/invalidation/invalidator_registrar.h" #include "components/keyed_service/core/keyed_service.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" +#include "sync/notifier/invalidator_registrar.h" class Profile; diff --git a/chrome/browser/invalidation/invalidation_service_android_unittest.cc b/chrome/browser/invalidation/invalidation_service_android_unittest.cc index 1aaf981..d652bee 100644 --- a/chrome/browser/invalidation/invalidation_service_android_unittest.cc +++ b/chrome/browser/invalidation/invalidation_service_android_unittest.cc @@ -9,8 +9,8 @@ #include "chrome/browser/invalidation/invalidation_service_factory.h" #include "chrome/browser/invalidation/invalidation_service_test_template.h" #include "chrome/test/base/testing_profile.h" -#include "components/invalidation/fake_invalidation_handler.h" #include "content/public/browser/notification_service.h" +#include "sync/notifier/fake_invalidation_handler.h" #include "testing/gtest/include/gtest/gtest.h" namespace invalidation { diff --git a/chrome/browser/invalidation/invalidation_service_test_template.h b/chrome/browser/invalidation/invalidation_service_test_template.h index 52d00d4..2cfef14 100644 --- a/chrome/browser/invalidation/invalidation_service_test_template.h +++ b/chrome/browser/invalidation/invalidation_service_test_template.h @@ -73,7 +73,6 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "components/invalidation/fake_invalidation_handler.h" #include "components/invalidation/invalidation_service.h" #include "content/public/test/test_browser_thread_bundle.h" #include "google/cacheinvalidation/include/types.h" @@ -81,6 +80,7 @@ #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/fake_invalidation_handler.h" #include "sync/notifier/object_id_invalidation_map.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/invalidation/ticl_invalidation_service.cc b/chrome/browser/invalidation/ticl_invalidation_service.cc index 487bdb9..f2f5cf3c 100644 --- a/chrome/browser/invalidation/ticl_invalidation_service.cc +++ b/chrome/browser/invalidation/ticl_invalidation_service.cc @@ -10,12 +10,13 @@ #include "chrome/common/chrome_content_client.h" #include "components/gcm_driver/gcm_driver.h" #include "components/invalidation/invalidation_service_util.h" -#include "components/invalidation/non_blocking_invalidator.h" #include "google_apis/gaia/gaia_constants.h" #include "net/url_request/url_request_context_getter.h" -#include "sync/internal_api/public/base/invalidator_state.h" +#include "sync/notifier/gcm_network_channel_delegate.h" #include "sync/notifier/invalidation_util.h" #include "sync/notifier/invalidator.h" +#include "sync/notifier/invalidator_state.h" +#include "sync/notifier/non_blocking_invalidator.h" #include "sync/notifier/object_id_invalidation_map.h" static const char* kOAuth2Scopes[] = { diff --git a/chrome/browser/invalidation/ticl_invalidation_service.h b/chrome/browser/invalidation/ticl_invalidation_service.h index 290882c..ebb63a2 100644 --- a/chrome/browser/invalidation/ticl_invalidation_service.h +++ b/chrome/browser/invalidation/ticl_invalidation_service.h @@ -16,13 +16,13 @@ #include "base/values.h" #include "components/invalidation/invalidation_logger.h" #include "components/invalidation/invalidation_service.h" -#include "components/invalidation/invalidator_registrar.h" #include "components/invalidation/ticl_settings_provider.h" #include "components/keyed_service/core/keyed_service.h" #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" +#include "sync/notifier/invalidator_registrar.h" namespace gcm { class GCMDriver; diff --git a/chrome/browser/invalidation/ticl_invalidation_service_unittest.cc b/chrome/browser/invalidation/ticl_invalidation_service_unittest.cc index 9a29ebd..9127f28 100644 --- a/chrome/browser/invalidation/ticl_invalidation_service_unittest.cc +++ b/chrome/browser/invalidation/ticl_invalidation_service_unittest.cc @@ -11,11 +11,11 @@ #include "chrome/browser/invalidation/invalidation_service_test_template.h" #include "components/gcm_driver/fake_gcm_driver.h" #include "components/gcm_driver/gcm_driver.h" -#include "components/invalidation/fake_invalidation_state_tracker.h" -#include "components/invalidation/fake_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/fake_invalidation_state_tracker.h" +#include "sync/notifier/fake_invalidator.h" #include "sync/notifier/invalidation_state_tracker.h" #include "sync/notifier/invalidator.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/invalidation/ticl_profile_settings_provider_unittest.cc b/chrome/browser/invalidation/ticl_profile_settings_provider_unittest.cc index f0e0dbe..d7fb24b 100644 --- a/chrome/browser/invalidation/ticl_profile_settings_provider_unittest.cc +++ b/chrome/browser/invalidation/ticl_profile_settings_provider_unittest.cc @@ -12,13 +12,13 @@ #include "chrome/browser/services/gcm/gcm_profile_service_factory.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" -#include "components/invalidation/fake_invalidation_state_tracker.h" #include "components/invalidation/ticl_settings_provider.h" #include "content/public/test/test_browser_thread_bundle.h" #include "google_apis/gaia/fake_identity_provider.h" #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/fake_invalidation_state_tracker.h" #include "sync/notifier/invalidation_state_tracker.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/sync/glue/sync_backend_host_impl_unittest.cc b/chrome/browser/sync/glue/sync_backend_host_impl_unittest.cc index dfccb18..6148be9 100644 --- a/chrome/browser/sync/glue/sync_backend_host_impl_unittest.cc +++ b/chrome/browser/sync/glue/sync_backend_host_impl_unittest.cc @@ -28,7 +28,6 @@ #include "content/public/test/test_utils.h" #include "google/cacheinvalidation/include/types.h" #include "net/url_request/test_url_fetcher_factory.h" -#include "sync/internal_api/public/base/invalidator_state.h" #include "sync/internal_api/public/base/model_type.h" #include "sync/internal_api/public/engine/model_safe_worker.h" #include "sync/internal_api/public/http_bridge_network_resources.h" @@ -39,6 +38,7 @@ #include "sync/internal_api/public/sync_manager_factory.h" #include "sync/internal_api/public/test/fake_sync_manager.h" #include "sync/internal_api/public/util/experiments.h" +#include "sync/notifier/invalidator_state.h" #include "sync/protocol/encryption.pb.h" #include "sync/protocol/sync_protocol_error.h" #include "sync/util/test_unrecoverable_error_handler.h" diff --git a/chrome/browser/sync/test/integration/fake_server_invalidation_service.h b/chrome/browser/sync/test/integration/fake_server_invalidation_service.h index b7813fb..6c4ea71 100644 --- a/chrome/browser/sync/test/integration/fake_server_invalidation_service.h +++ b/chrome/browser/sync/test/integration/fake_server_invalidation_service.h @@ -11,9 +11,9 @@ #include "base/basictypes.h" #include "chrome/browser/signin/fake_profile_oauth2_token_service.h" #include "components/invalidation/invalidation_service.h" -#include "components/invalidation/invalidator_registrar.h" #include "google_apis/gaia/fake_identity_provider.h" #include "sync/internal_api/public/base/model_type.h" +#include "sync/notifier/invalidator_registrar.h" #include "sync/test/fake_server/fake_server.h" namespace content { diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc index c6736a4..aeb6416 100644 --- a/chrome/browser/sync/test/integration/sync_test.cc +++ b/chrome/browser/sync/test/integration/sync_test.cc @@ -52,7 +52,6 @@ #include "components/bookmarks/test/bookmark_test_helpers.h" #include "components/invalidation/invalidation_switches.h" #include "components/invalidation/p2p_invalidation_service.h" -#include "components/invalidation/p2p_invalidator.h" #include "components/os_crypt/os_crypt.h" #include "components/signin/core/browser/signin_manager.h" #include "content/public/browser/web_contents.h" @@ -71,6 +70,7 @@ #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" #include "sync/engine/sync_scheduler_impl.h" +#include "sync/notifier/p2p_invalidator.h" #include "sync/protocol/sync.pb.h" #include "sync/test/fake_server/fake_server.h" #include "sync/test/fake_server/fake_server_network_resources.h" diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi index d0bfa79..8214fd9 100644 --- a/chrome/chrome_tests_unit.gypi +++ b/chrome/chrome_tests_unit.gypi @@ -20,7 +20,6 @@ '../base/base.gyp:test_support_base', '../components/components.gyp:bookmarks_test_support', '../components/components.gyp:gcm_driver_test_support', - '../components/components.gyp:invalidation_test_support', '../components/components.gyp:metrics_test_support', '../components/components.gyp:password_manager_core_browser_test_support', '../components/components.gyp:signin_core_browser_test_support', diff --git a/components/components_tests.gyp b/components/components_tests.gyp index 319d381..56dd758 100644 --- a/components/components_tests.gyp +++ b/components/components_tests.gyp @@ -254,7 +254,6 @@ # Dependencies of invalidation 'components.gyp:invalidation', - 'components.gyp:invalidation_test_support', # Dependencies of json_schema 'components.gyp:json_schema', @@ -461,19 +460,6 @@ '../third_party/libusb/libusb.gyp:libusb', ], }], - ['OS != "android"', { - 'sources': [ - 'invalidation/fake_invalidator_unittest.cc', - 'invalidation/gcm_network_channel_unittest.cc', - 'invalidation/invalidation_notifier_unittest.cc', - 'invalidation/invalidator_registrar_unittest.cc', - 'invalidation/non_blocking_invalidator_unittest.cc', - 'invalidation/p2p_invalidator_unittest.cc', - 'invalidation/push_client_channel_unittest.cc', - 'invalidation/sync_invalidation_listener_unittest.cc', - 'invalidation/sync_system_resources_unittest.cc', - ], - }], ['chromeos==1', { 'sources': [ 'metrics/chromeos/serialization_utils_unittest.cc', diff --git a/components/invalidation.gypi b/components/invalidation.gypi index fc39383..e6fae99 100644 --- a/components/invalidation.gypi +++ b/components/invalidation.gypi @@ -9,10 +9,9 @@ 'type': 'static_library', 'dependencies': [ '../base/base.gyp:base', - '../google_apis/google_apis.gyp:google_apis', - '../jingle/jingle.gyp:notifier', '../sync/sync.gyp:sync', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation', + '../jingle/jingle.gyp:notifier', 'keyed_service_core', 'pref_registry', ], @@ -30,37 +29,11 @@ 'invalidation/invalidation_service_util.h', 'invalidation/invalidation_switches.cc', 'invalidation/invalidation_switches.h', - 'invalidation/invalidator_registrar.cc', - 'invalidation/invalidator_registrar.h', 'invalidation/invalidator_storage.cc', 'invalidation/invalidator_storage.h', 'invalidation/ticl_settings_provider.cc', 'invalidation/ticl_settings_provider.h', ], - 'conditions': [ - ['OS != "android"', { - 'sources': [ - 'invalidation/gcm_network_channel.cc', - 'invalidation/gcm_network_channel.h', - 'invalidation/gcm_network_channel_delegate.h', - 'invalidation/invalidation_notifier.cc', - 'invalidation/invalidation_notifier.h', - 'invalidation/non_blocking_invalidator.cc', - 'invalidation/non_blocking_invalidator.h', - 'invalidation/notifier_reason_util.cc', - 'invalidation/notifier_reason_util.h', - 'invalidation/p2p_invalidator.cc', - 'invalidation/p2p_invalidator.h', - 'invalidation/push_client_channel.cc', - 'invalidation/push_client_channel.h', - 'invalidation/state_writer.h', - 'invalidation/sync_invalidation_listener.cc', - 'invalidation/sync_invalidation_listener.h', - 'invalidation/sync_system_resources.cc', - 'invalidation/sync_system_resources.h', - ], - }], - ], }, { @@ -70,11 +43,8 @@ '../base/base.gyp:base', '../google_apis/google_apis.gyp:google_apis', '../jingle/jingle.gyp:notifier', - '../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', 'keyed_service_core', ], @@ -82,22 +52,8 @@ '..', ], 'sources': [ - 'invalidation/fake_invalidation_handler.cc', - 'invalidation/fake_invalidation_handler.h', - 'invalidation/fake_invalidation_state_tracker.cc', - 'invalidation/fake_invalidation_state_tracker.h', - 'invalidation/fake_invalidator.cc', - 'invalidation/fake_invalidator.h', - 'invalidation/invalidator_test_template.cc', - 'invalidation/invalidator_test_template.h', - ], - 'conditions': [ - ['OS != "android"', { - 'sources': [ - 'invalidation/p2p_invalidation_service.cc', - 'invalidation/p2p_invalidation_service.h', - ], - }], + 'invalidation/p2p_invalidation_service.cc', + 'invalidation/p2p_invalidation_service.h', ], }, ], diff --git a/components/invalidation/DEPS b/components/invalidation/DEPS index 279d079..0cefc07 100644 --- a/components/invalidation/DEPS +++ b/components/invalidation/DEPS @@ -6,20 +6,9 @@ include_rules = [ "+google/cacheinvalidation", "+google_apis/gaia", - "+google_apis/gcm", "+jingle/notifier", - "+net/base/backoff_entry.h", - "+net/base/mock_host_resolver.h", - "+net/base/network_change_notifier.h", - "+net/http/http_status_code.h", "+net/url_request", - # sync_notifier depends on the xmpp part of libjingle. - "+talk/xmpp", - - #TODO(rlarocque): Move these dependencies into this component. - # See crbug.com/259559. "+sync/internal_api/public/base", - "+sync/internal_api/public/util", "+sync/notifier", ] diff --git a/components/invalidation/invalidation_export.h b/components/invalidation/invalidation_export.h deleted file mode 100644 index 08683be..0000000 --- a/components/invalidation/invalidation_export.h +++ /dev/null @@ -1,21 +0,0 @@ -// 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 COMPONENTS_INVALIDATION_INVALIDATION_EXPORT_H_ -#define COMPONENTS_INVALIDATION_INVALIDATION_EXPORT_H_ - -// The files under components/invalidation do not currently support a shared -// library build. There's no point in attaching attributes to them. -// -// Many of the files in this directory are imports from sync/notifier, which -// did support a shared library build. We can use this existing set of export -// declarations as a starting point when we prepare this directory for a shared -// library build. -// -// For now, we provide dummy definitions of these tags. - -#define INVALIDATION_EXPORT -#define INVALIDATION_EXPORT_PRIVATE - -#endif // COMPONENTS_INVALIDATION_INVALIDATION_EXPORT_H_ diff --git a/components/invalidation/invalidation_logger.h b/components/invalidation/invalidation_logger.h index afe248c..d14dabbb 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/invalidator_state.h" #include "sync/notifier/invalidation_util.h" +#include "sync/notifier/invalidator_state.h" namespace base { class DictionaryValue; diff --git a/components/invalidation/invalidation_logger_observer.h b/components/invalidation/invalidation_logger_observer.h index d19e8a5..dc0fd5a 100644 --- a/components/invalidation/invalidation_logger_observer.h +++ b/components/invalidation/invalidation_logger_observer.h @@ -6,8 +6,8 @@ #define COMPONENTS_INVALIDATION_INVALIDATION_LOGGER_OBSERVER_H_ #include "base/memory/scoped_ptr.h" -#include "sync/internal_api/public/base/invalidator_state.h" #include "sync/notifier/invalidation_util.h" +#include "sync/notifier/invalidator_state.h" #include "sync/notifier/object_id_invalidation_map.h" namespace base { diff --git a/components/invalidation/invalidation_service.h b/components/invalidation/invalidation_service.h index 7b6f3cd..456d411 100644 --- a/components/invalidation/invalidation_service.h +++ b/components/invalidation/invalidation_service.h @@ -7,8 +7,8 @@ #include "base/callback_forward.h" #include "components/keyed_service/core/keyed_service.h" -#include "sync/internal_api/public/base/invalidator_state.h" #include "sync/notifier/invalidation_util.h" +#include "sync/notifier/invalidator_state.h" class IdentityProvider; diff --git a/components/invalidation/notifier_reason_util.h b/components/invalidation/notifier_reason_util.h deleted file mode 100644 index 530cbb8..0000000 --- a/components/invalidation/notifier_reason_util.h +++ /dev/null @@ -1,22 +0,0 @@ -// 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 COMPONENTS_INVALIDATION_NOTIFIER_REASON_UTIL_H_ -#define COMPONENTS_INVALIDATION_NOTIFIER_REASON_UTIL_H_ - -#include "jingle/notifier/listener/push_client_observer.h" -#include "sync/internal_api/public/base/invalidator_state.h" - -namespace syncer { - -InvalidatorState FromNotifierReason( - notifier::NotificationsDisabledReason reason); - -// Should not be called when |state| == INVALIDATIONS_ENABLED. -notifier::NotificationsDisabledReason - ToNotifierReasonForTest(InvalidatorState state); - -} // namespace syncer - -#endif // COMPONENTS_INVALIDATION_NOTIFIER_REASON_UTIL_H_ diff --git a/components/invalidation/p2p_invalidation_service.cc b/components/invalidation/p2p_invalidation_service.cc index 451bddf..4eb98b6 100644 --- a/components/invalidation/p2p_invalidation_service.cc +++ b/components/invalidation/p2p_invalidation_service.cc @@ -6,11 +6,11 @@ #include "base/command_line.h" #include "components/invalidation/invalidation_service_util.h" -#include "components/invalidation/p2p_invalidator.h" #include "google_apis/gaia/identity_provider.h" #include "jingle/notifier/base/notifier_options.h" #include "jingle/notifier/listener/push_client.h" #include "net/url_request/url_request_context_getter.h" +#include "sync/notifier/p2p_invalidator.h" namespace net { class URLRequestContextGetter; diff --git a/components/invalidation/p2p_invalidation_service.h b/components/invalidation/p2p_invalidation_service.h index 94276b7..7107201 100644 --- a/components/invalidation/p2p_invalidation_service.h +++ b/components/invalidation/p2p_invalidation_service.h @@ -6,8 +6,8 @@ #include "base/memory/ref_counted.h" #include "base/threading/non_thread_safe.h" #include "components/invalidation/invalidation_service.h" -#include "components/invalidation/p2p_invalidator.h" #include "components/keyed_service/core/keyed_service.h" +#include "sync/notifier/p2p_invalidator.h" #ifndef COMPONENTS_INVALIDATION_P2P_INVALIDATION_SERVICE_H_ #define COMPONENTS_INVALIDATION_P2P_INVALIDATION_SERVICE_H_ diff --git a/sync/internal_api/public/base/invalidator_state.cc b/sync/internal_api/public/base/invalidator_state.cc deleted file mode 100644 index e42ca63..0000000 --- a/sync/internal_api/public/base/invalidator_state.cc +++ /dev/null @@ -1,25 +0,0 @@ -// 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/invalidator_state.h" - -#include "base/logging.h" - -namespace syncer { - -const char* InvalidatorStateToString(InvalidatorState state) { - switch (state) { - case TRANSIENT_INVALIDATION_ERROR: - return "TRANSIENT_INVALIDATION_ERROR"; - case INVALIDATION_CREDENTIALS_REJECTED: - return "INVALIDATION_CREDENTIALS_REJECTED"; - case INVALIDATIONS_ENABLED: - return "INVALIDATIONS_ENABLED"; - default: - NOTREACHED(); - return "UNKNOWN_INVALIDATOR_STATE"; - } -} - -} // namespace syncer diff --git a/sync/internal_api/public/test/fake_sync_manager.h b/sync/internal_api/public/test/fake_sync_manager.h index 31f5d412..9b2dbea 100644 --- a/sync/internal_api/public/test/fake_sync_manager.h +++ b/sync/internal_api/public/test/fake_sync_manager.h @@ -12,6 +12,7 @@ #include "sync/internal_api/public/sync_manager.h" #include "sync/internal_api/public/test/null_sync_core_proxy.h" #include "sync/internal_api/public/test/test_user_share.h" +#include "sync/notifier/invalidator_registrar.h" namespace base { class SequencedTaskRunner; @@ -156,6 +157,9 @@ class FakeSyncManager : public SyncManager { // The set of types that have been enabled. ModelTypeSet enabled_types_; + // Faked invalidator state. + InvalidatorRegistrar registrar_; + // The types for which a refresh was most recently requested. ModelTypeSet last_refresh_request_types_; diff --git a/sync/internal_api/sync_manager_impl.h b/sync/internal_api/sync_manager_impl.h index dd6e191..2e02b60 100644 --- a/sync/internal_api/sync_manager_impl.h +++ b/sync/internal_api/sync_manager_impl.h @@ -19,13 +19,13 @@ #include "sync/internal_api/js_sync_encryption_handler_observer.h" #include "sync/internal_api/js_sync_manager_observer.h" #include "sync/internal_api/protocol_event_buffer.h" -#include "sync/internal_api/public/base/invalidator_state.h" #include "sync/internal_api/public/sync_core_proxy.h" #include "sync/internal_api/public/sync_manager.h" #include "sync/internal_api/public/user_share.h" #include "sync/internal_api/sync_encryption_handler_impl.h" #include "sync/js/js_backend.h" #include "sync/notifier/invalidation_handler.h" +#include "sync/notifier/invalidator_state.h" #include "sync/syncable/directory_change_delegate.h" #include "sync/util/cryptographer.h" #include "sync/util/time.h" diff --git a/sync/internal_api/sync_manager_impl_unittest.cc b/sync/internal_api/sync_manager_impl_unittest.cc index a3eff02..20b7685 100644 --- a/sync/internal_api/sync_manager_impl_unittest.cc +++ b/sync/internal_api/sync_manager_impl_unittest.cc @@ -45,6 +45,7 @@ #include "sync/js/js_backend.h" #include "sync/js/js_event_handler.h" #include "sync/js/js_test_util.h" +#include "sync/notifier/fake_invalidation_handler.h" #include "sync/notifier/invalidation_handler.h" #include "sync/notifier/invalidator.h" #include "sync/protocol/bookmark_specifics.pb.h" diff --git a/sync/internal_api/test/fake_sync_manager.cc b/sync/internal_api/test/fake_sync_manager.cc index 7526795..9374cd1 100644 --- a/sync/internal_api/test/fake_sync_manager.cc +++ b/sync/internal_api/test/fake_sync_manager.cc @@ -14,11 +14,11 @@ #include "base/sequenced_task_runner.h" #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" -#include "sync/internal_api/public/base/invalidator_state.h" #include "sync/internal_api/public/http_post_provider_factory.h" #include "sync/internal_api/public/internal_components_factory.h" #include "sync/internal_api/public/util/weak_handle.h" #include "sync/notifier/invalidator.h" +#include "sync/notifier/invalidator_state.h" #include "sync/notifier/object_id_invalidation_map.h" #include "sync/syncable/directory.h" #include "sync/test/fake_sync_encryption_handler.h" diff --git a/sync/notifier/DEPS b/sync/notifier/DEPS index 0856674..c16c291 100644 --- a/sync/notifier/DEPS +++ b/sync/notifier/DEPS @@ -1,7 +1,20 @@ include_rules = [ "+google/cacheinvalidation", + "+jingle/notifier", + "+net/base/backoff_entry.h", + "+net/base/mock_host_resolver.h", + "+net/base/network_change_notifier.h", + "+net/http/http_status_code.h", + "+net/url_request", "+sync/base", "+sync/internal_api/public/base", "+sync/internal_api/public/util", + "+sync/protocol/service_constants.h", + "+sync/util", + + # unit tests depend on talk/base. + "+talk/base", + # sync_notifier depends on the xmpp part of libjingle. + "+talk/xmpp", ] diff --git a/components/invalidation/fake_invalidation_handler.cc b/sync/notifier/fake_invalidation_handler.cc index 949c756..e6497a4 100644 --- a/components/invalidation/fake_invalidation_handler.cc +++ b/sync/notifier/fake_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 "components/invalidation/fake_invalidation_handler.h" +#include "sync/notifier/fake_invalidation_handler.h" namespace syncer { diff --git a/components/invalidation/fake_invalidation_handler.h b/sync/notifier/fake_invalidation_handler.h index 611f02c..985de50 100644 --- a/components/invalidation/fake_invalidation_handler.h +++ b/sync/notifier/fake_invalidation_handler.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef COMPONENTS_INVALIDATION_FAKE_INVALIDATION_HANDLER_H_ -#define COMPONENTS_INVALIDATION_FAKE_INVALIDATION_HANDLER_H_ +#ifndef SYNC_NOTIFIER_FAKE_SYNC_NOTIFIER_OBSERVER_H_ +#define SYNC_NOTIFIER_FAKE_SYNC_NOTIFIER_OBSERVER_H_ #include <string> @@ -39,4 +39,4 @@ class FakeInvalidationHandler : public InvalidationHandler { } // namespace syncer -#endif // COMPONENTS_INVALIDATION_FAKE_INVALIDATION_HANDLER_H_ +#endif // SYNC_NOTIFIER_FAKE_SYNC_NOTIFIER_OBSERVER_H_ diff --git a/components/invalidation/fake_invalidation_state_tracker.cc b/sync/notifier/fake_invalidation_state_tracker.cc index 6dda929..681bda9 100644 --- a/components/invalidation/fake_invalidation_state_tracker.cc +++ b/sync/notifier/fake_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 "components/invalidation/fake_invalidation_state_tracker.h" +#include "sync/notifier/fake_invalidation_state_tracker.h" #include "base/bind.h" #include "base/callback.h" diff --git a/components/invalidation/fake_invalidation_state_tracker.h b/sync/notifier/fake_invalidation_state_tracker.h index 297e6a4..cd19134 100644 --- a/components/invalidation/fake_invalidation_state_tracker.h +++ b/sync/notifier/fake_invalidation_state_tracker.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef COMPONENTS_INVALIDATION_FAKE_INVALIDATION_STATE_TRACKER_H_ -#define COMPONENTS_INVALIDATION_FAKE_INVALIDATION_STATE_TRACKER_H_ +#ifndef SYNC_NOTIFIER_FAKE_INVALIDATION_STATE_TRACKER_H_ +#define SYNC_NOTIFIER_FAKE_INVALIDATION_STATE_TRACKER_H_ #include "base/memory/weak_ptr.h" #include "sync/notifier/invalidation_state_tracker.h" @@ -39,4 +39,4 @@ class FakeInvalidationStateTracker } // namespace syncer -#endif // COMPONENTS_INVALIDATION_FAKE_INVALIDATION_STATE_TRACKER_H_ +#endif // SYNC_NOTIFIER_FAKE_INVALIDATION_STATE_TRACKER_H_ diff --git a/components/invalidation/fake_invalidator.cc b/sync/notifier/fake_invalidator.cc index 220fe76..cec6f52 100644 --- a/components/invalidation/fake_invalidator.cc +++ b/sync/notifier/fake_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 "components/invalidation/fake_invalidator.h" +#include "sync/notifier/fake_invalidator.h" #include "sync/notifier/object_id_invalidation_map.h" diff --git a/components/invalidation/fake_invalidator.h b/sync/notifier/fake_invalidator.h index 319a450..25d03e2 100644 --- a/components/invalidation/fake_invalidator.h +++ b/sync/notifier/fake_invalidator.h @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef COMPONENTS_INVALIDATION_FAKE_INVALIDATOR_H_ -#define COMPONENTS_INVALIDATION_FAKE_INVALIDATOR_H_ +#ifndef SYNC_NOTIFIER_FAKE_INVALIDATOR_H_ +#define SYNC_NOTIFIER_FAKE_INVALIDATOR_H_ #include <string> #include "base/callback_forward.h" #include "base/compiler_specific.h" -#include "components/invalidation/invalidator_registrar.h" #include "sync/notifier/invalidation_util.h" #include "sync/notifier/invalidator.h" +#include "sync/notifier/invalidator_registrar.h" namespace syncer { @@ -50,4 +50,4 @@ class FakeInvalidator : public Invalidator { } // namespace syncer -#endif // COMPONENTS_INVALIDATION_FAKE_INVALIDATOR_H_ +#endif // SYNC_NOTIFIER_FAKE_INVALIDATOR_H_ diff --git a/components/invalidation/fake_invalidator_unittest.cc b/sync/notifier/fake_invalidator_unittest.cc index d7c2d17..c48098a 100644 --- a/components/invalidation/fake_invalidator_unittest.cc +++ b/sync/notifier/fake_invalidator_unittest.cc @@ -4,8 +4,8 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "components/invalidation/fake_invalidator.h" -#include "components/invalidation/invalidator_test_template.h" +#include "sync/notifier/fake_invalidator.h" +#include "sync/notifier/invalidator_test_template.h" #include "testing/gtest/include/gtest/gtest.h" namespace syncer { diff --git a/components/invalidation/gcm_network_channel.cc b/sync/notifier/gcm_network_channel.cc index 7ee08af..59f1a57 100644 --- a/components/invalidation/gcm_network_channel.cc +++ b/sync/notifier/gcm_network_channel.cc @@ -16,12 +16,12 @@ #include "google/cacheinvalidation/channel_common.pb.h" #include "google/cacheinvalidation/types.pb.h" #endif -#include "components/invalidation/gcm_network_channel.h" -#include "components/invalidation/gcm_network_channel_delegate.h" #include "google_apis/gaia/google_service_auth_error.h" #include "net/http/http_status_code.h" #include "net/url_request/url_fetcher.h" #include "net/url_request/url_request_status.h" +#include "sync/notifier/gcm_network_channel.h" +#include "sync/notifier/gcm_network_channel_delegate.h" namespace syncer { diff --git a/components/invalidation/gcm_network_channel.h b/sync/notifier/gcm_network_channel.h index e9a5131..5f86ce7 100644 --- a/components/invalidation/gcm_network_channel.h +++ b/sync/notifier/gcm_network_channel.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef COMPONENTS_INVALIDATION_GCM_NETWORK_CHANNEL_H_ -#define COMPONENTS_INVALIDATION_GCM_NETWORK_CHANNEL_H_ +#ifndef SYNC_NOTIFIER_GCM_NETWORK_CHANNEL_H_ +#define SYNC_NOTIFIER_GCM_NETWORK_CHANNEL_H_ #include <string> @@ -11,12 +11,12 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/threading/non_thread_safe.h" -#include "components/invalidation/gcm_network_channel_delegate.h" -#include "components/invalidation/invalidation_export.h" -#include "components/invalidation/sync_system_resources.h" #include "net/base/backoff_entry.h" #include "net/base/network_change_notifier.h" #include "net/url_request/url_fetcher_delegate.h" +#include "sync/base/sync_export.h" +#include "sync/notifier/gcm_network_channel_delegate.h" +#include "sync/notifier/sync_system_resources.h" #include "url/gurl.h" class GoogleServiceAuthError; @@ -46,7 +46,7 @@ struct GCMNetworkChannelDiagnostic { // GCMNetworkChannel is an implementation of SyncNetworkChannel that routes // messages through GCMService. -class INVALIDATION_EXPORT_PRIVATE GCMNetworkChannel +class SYNC_EXPORT_PRIVATE GCMNetworkChannel : public SyncNetworkChannel, public net::URLFetcherDelegate, public net::NetworkChangeNotifier::NetworkChangeObserver, @@ -132,4 +132,4 @@ class INVALIDATION_EXPORT_PRIVATE GCMNetworkChannel } // namespace syncer -#endif // COMPONENTS_INVALIDATION_GCM_NETWORK_CHANNEL_H_ +#endif // SYNC_NOTIFIER_GCM_NETWORK_CHANNEL_H_ diff --git a/components/invalidation/gcm_network_channel_delegate.h b/sync/notifier/gcm_network_channel_delegate.h index 5229dec..36485a1 100644 --- a/components/invalidation/gcm_network_channel_delegate.h +++ b/sync/notifier/gcm_network_channel_delegate.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef COMPONENTS_INVALIDATION_GCM_NETWORK_CHANNEL_DELEGATE_H_ -#define COMPONENTS_INVALIDATION_GCM_NETWORK_CHANNEL_DELEGATE_H_ +#ifndef SYNC_NOTIFIER_GCM_NETWORK_CHANNEL_DELEGATE_H_ +#define SYNC_NOTIFIER_GCM_NETWORK_CHANNEL_DELEGATE_H_ #include <string> @@ -48,4 +48,4 @@ class GCMNetworkChannelDelegate { }; } // namespace syncer -#endif // COMPONENTS_INVALIDATION_GCM_NETWORK_CHANNEL_DELEGATE_H_ +#endif // SYNC_NOTIFIER_GCM_NETWORK_CHANNEL_DELEGATE_H_ diff --git a/components/invalidation/gcm_network_channel_unittest.cc b/sync/notifier/gcm_network_channel_unittest.cc index 29cab07..2564d0b 100644 --- a/components/invalidation/gcm_network_channel_unittest.cc +++ b/sync/notifier/gcm_network_channel_unittest.cc @@ -4,10 +4,10 @@ #include "base/run_loop.h" #include "base/strings/string_util.h" -#include "components/invalidation/gcm_network_channel.h" #include "google_apis/gaia/google_service_auth_error.h" #include "net/url_request/test_url_fetcher_factory.h" #include "net/url_request/url_request_test_util.h" +#include "sync/notifier/gcm_network_channel.h" #include "testing/gtest/include/gtest/gtest.h" namespace syncer { diff --git a/sync/notifier/invalidation_handler.h b/sync/notifier/invalidation_handler.h index a999cf6..29843904 100644 --- a/sync/notifier/invalidation_handler.h +++ b/sync/notifier/invalidation_handler.h @@ -6,7 +6,7 @@ #define SYNC_NOTIFIER_INVALIDATION_HANDLER_H_ #include "sync/base/sync_export.h" -#include "sync/internal_api/public/base/invalidator_state.h" +#include "sync/notifier/invalidator_state.h" namespace syncer { diff --git a/components/invalidation/invalidation_notifier.cc b/sync/notifier/invalidation_notifier.cc index 016dd5f..7e3e8a3 100644 --- a/components/invalidation/invalidation_notifier.cc +++ b/sync/notifier/invalidation_notifier.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "components/invalidation/invalidation_notifier.h" +#include "sync/notifier/invalidation_notifier.h" #include "base/bind.h" #include "base/logging.h" diff --git a/components/invalidation/invalidation_notifier.h b/sync/notifier/invalidation_notifier.h index 1f51c6d..cd60a06 100644 --- a/components/invalidation/invalidation_notifier.h +++ b/sync/notifier/invalidation_notifier.h @@ -9,8 +9,8 @@ // You probably don't want to use this directly; use // NonBlockingInvalidator. -#ifndef COMPONENTS_INVALIDATION_INVALIDATION_NOTIFIER_H_ -#define COMPONENTS_INVALIDATION_INVALIDATION_NOTIFIER_H_ +#ifndef SYNC_NOTIFIER_INVALIDATION_NOTIFIER_H_ +#define SYNC_NOTIFIER_INVALIDATION_NOTIFIER_H_ #include <string> @@ -18,13 +18,13 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/threading/non_thread_safe.h" -#include "components/invalidation/invalidation_export.h" -#include "components/invalidation/invalidator_registrar.h" -#include "components/invalidation/sync_invalidation_listener.h" +#include "sync/base/sync_export.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" +#include "sync/notifier/invalidator_registrar.h" +#include "sync/notifier/sync_invalidation_listener.h" namespace notifier { class PushClient; @@ -33,7 +33,7 @@ class PushClient; namespace syncer { // This class must live on the IO thread. -class INVALIDATION_EXPORT_PRIVATE InvalidationNotifier +class SYNC_EXPORT_PRIVATE InvalidationNotifier : public Invalidator, public SyncInvalidationListener::Delegate, public base::NonThreadSafe { @@ -105,4 +105,4 @@ class INVALIDATION_EXPORT_PRIVATE InvalidationNotifier } // namespace syncer -#endif // COMPONENTS_INVALIDATION_INVALIDATION_NOTIFIER_H_ +#endif // SYNC_NOTIFIER_INVALIDATION_NOTIFIER_H_ diff --git a/components/invalidation/invalidation_notifier_unittest.cc b/sync/notifier/invalidation_notifier_unittest.cc index 2927b07..75c6b3a 100644 --- a/components/invalidation/invalidation_notifier_unittest.cc +++ b/sync/notifier/invalidation_notifier_unittest.cc @@ -2,21 +2,21 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "components/invalidation/invalidation_notifier.h" +#include "sync/notifier/invalidation_notifier.h" #include "base/memory/scoped_ptr.h" #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/invalidator_test_template.h" -#include "components/invalidation/push_client_channel.h" #include "jingle/notifier/base/fake_base_task.h" #include "jingle/notifier/base/notifier_options.h" #include "jingle/notifier/listener/fake_push_client.h" #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/fake_invalidation_handler.h" +#include "sync/notifier/fake_invalidation_state_tracker.h" #include "sync/notifier/invalidation_state_tracker.h" +#include "sync/notifier/invalidator_test_template.h" +#include "sync/notifier/push_client_channel.h" #include "testing/gtest/include/gtest/gtest.h" namespace syncer { diff --git a/sync/notifier/invalidation_state_tracker.cc b/sync/notifier/invalidation_state_tracker.cc deleted file mode 100644 index ab3ce17..0000000 --- a/sync/notifier/invalidation_state_tracker.cc +++ /dev/null @@ -1,13 +0,0 @@ -// 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_state_tracker.h" - -namespace syncer { - -InvalidationStateTracker::InvalidationStateTracker() {} - -InvalidationStateTracker::~InvalidationStateTracker() {} - -} // namespace syncer diff --git a/sync/notifier/invalidation_state_tracker.h b/sync/notifier/invalidation_state_tracker.h index 6f4c133..22e3e6f 100644 --- a/sync/notifier/invalidation_state_tracker.h +++ b/sync/notifier/invalidation_state_tracker.h @@ -32,8 +32,8 @@ namespace syncer { class SYNC_EXPORT InvalidationStateTracker { public: - InvalidationStateTracker(); - virtual ~InvalidationStateTracker(); + InvalidationStateTracker() {} + virtual ~InvalidationStateTracker() {} // The per-client unique ID used to register the invalidation client with the // server. This is used to squelch invalidation notifications that originate diff --git a/sync/notifier/invalidator.h b/sync/notifier/invalidator.h index 0ed26e2..3c50fe6 100644 --- a/sync/notifier/invalidator.h +++ b/sync/notifier/invalidator.h @@ -12,9 +12,9 @@ #include <string> #include "sync/base/sync_export.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" +#include "sync/notifier/invalidator_state.h" namespace syncer { class InvalidationHandler; diff --git a/components/invalidation/invalidator_registrar.cc b/sync/notifier/invalidator_registrar.cc index c22f259..27f206b 100644 --- a/components/invalidation/invalidator_registrar.cc +++ b/sync/notifier/invalidator_registrar.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 "components/invalidation/invalidator_registrar.h" +#include "sync/notifier/invalidator_registrar.h" #include <cstddef> #include <iterator> diff --git a/components/invalidation/invalidator_registrar.h b/sync/notifier/invalidator_registrar.h index 854de60..2b636d7 100644 --- a/components/invalidation/invalidator_registrar.h +++ b/sync/notifier/invalidator_registrar.h @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef COMPONENTS_INVALIDATION_INVALIDATOR_REGISTRAR_H_ -#define COMPONENTS_INVALIDATION_INVALIDATOR_REGISTRAR_H_ +#ifndef SYNC_NOTIFIER_INVALIDATOR_REGISTRAR_H_ +#define SYNC_NOTIFIER_INVALIDATOR_REGISTRAR_H_ #include <map> #include "base/basictypes.h" #include "base/observer_list.h" #include "base/threading/thread_checker.h" -#include "components/invalidation/invalidation_export.h" +#include "sync/base/sync_export.h" #include "sync/notifier/invalidation_handler.h" #include "sync/notifier/invalidation_util.h" @@ -26,7 +26,7 @@ class ObjectIdInvalidationMap; // keep track of registered handlers and which object ID registrations are // associated with which handlers, so implementors can just reuse the logic // here to dispatch invalidations and other interesting notifications. -class INVALIDATION_EXPORT InvalidatorRegistrar { +class SYNC_EXPORT InvalidatorRegistrar { public: InvalidatorRegistrar(); @@ -94,4 +94,4 @@ class INVALIDATION_EXPORT InvalidatorRegistrar { } // namespace syncer -#endif // COMPONENTS_INVALIDATION_INVALIDATOR_REGISTRAR_H_ +#endif // SYNC_NOTIFIER_INVALIDATOR_REGISTRAR_H_ diff --git a/components/invalidation/invalidator_registrar_unittest.cc b/sync/notifier/invalidator_registrar_unittest.cc index 10bd58d..24e1908 100644 --- a/components/invalidation/invalidator_registrar_unittest.cc +++ b/sync/notifier/invalidator_registrar_unittest.cc @@ -5,10 +5,10 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "components/invalidation/fake_invalidation_handler.h" -#include "components/invalidation/invalidator_registrar.h" -#include "components/invalidation/invalidator_test_template.h" #include "google/cacheinvalidation/types.pb.h" +#include "sync/notifier/fake_invalidation_handler.h" +#include "sync/notifier/invalidator_registrar.h" +#include "sync/notifier/invalidator_test_template.h" #include "testing/gtest/include/gtest/gtest.h" namespace syncer { diff --git a/components/invalidation/notifier_reason_util.cc b/sync/notifier/invalidator_state.cc index 55469f4..b57f4d0 100644 --- a/components/invalidation/notifier_reason_util.cc +++ b/sync/notifier/invalidator_state.cc @@ -2,12 +2,26 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "components/invalidation/notifier_reason_util.h" +#include "sync/notifier/invalidator_state.h" #include "base/logging.h" namespace syncer { +const char* InvalidatorStateToString(InvalidatorState state) { + switch (state) { + case TRANSIENT_INVALIDATION_ERROR: + return "TRANSIENT_INVALIDATION_ERROR"; + case INVALIDATION_CREDENTIALS_REJECTED: + return "INVALIDATION_CREDENTIALS_REJECTED"; + case INVALIDATIONS_ENABLED: + return "INVALIDATIONS_ENABLED"; + default: + NOTREACHED(); + return "UNKNOWN_INVALIDATOR_STATE"; + } +} + InvalidatorState FromNotifierReason( notifier::NotificationsDisabledReason reason) { switch (reason) { diff --git a/sync/internal_api/public/base/invalidator_state.h b/sync/notifier/invalidator_state.h index 3a1c7ee..a269661 100644 --- a/sync/internal_api/public/base/invalidator_state.h +++ b/sync/notifier/invalidator_state.h @@ -2,9 +2,10 @@ // 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_INVALIDATOR_STATE_H_ -#define SYNC_INTERNAL_API_PUBLIC_BASE_INVALIDATOR_STATE_H_ +#ifndef SYNC_NOTIFIER_INVALIDATOR_STATE_H_ +#define SYNC_NOTIFIER_INVALIDATOR_STATE_H_ +#include "jingle/notifier/listener/push_client_observer.h" #include "sync/base/sync_export.h" namespace syncer { @@ -25,6 +26,13 @@ enum InvalidatorState { SYNC_EXPORT const char* InvalidatorStateToString(InvalidatorState state); +InvalidatorState FromNotifierReason( + notifier::NotificationsDisabledReason reason); + +// Should not be called when |state| == INVALIDATIONS_ENABLED. +SYNC_EXPORT_PRIVATE notifier::NotificationsDisabledReason + ToNotifierReasonForTest(InvalidatorState state); + } // namespace syncer -#endif // SYNC_INTERNAL_API_PUBLIC_BASE_INVALIDATOR_STATE_H_ +#endif // SYNC_NOTIFIER_INVALIDATOR_STATE_H_ diff --git a/components/invalidation/invalidator_test_template.cc b/sync/notifier/invalidator_test_template.cc index 8f62630..0a93cf3 100644 --- a/components/invalidation/invalidator_test_template.cc +++ b/sync/notifier/invalidator_test_template.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 "components/invalidation/invalidator_test_template.h" +#include "sync/notifier/invalidator_test_template.h" namespace syncer { namespace internal { diff --git a/components/invalidation/invalidator_test_template.h b/sync/notifier/invalidator_test_template.h index 9b81047..c153088 100644 --- a/components/invalidation/invalidator_test_template.h +++ b/sync/notifier/invalidator_test_template.h @@ -74,16 +74,16 @@ // // Easy! -#ifndef COMPONENTS_INVALIDATION_INVALIDATOR_TEST_TEMPLATE_H_ -#define COMPONENTS_INVALIDATION_INVALIDATOR_TEST_TEMPLATE_H_ +#ifndef SYNC_NOTIFIER_INVALIDATOR_TEST_TEMPLATE_H_ +#define SYNC_NOTIFIER_INVALIDATOR_TEST_TEMPLATE_H_ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "components/invalidation/fake_invalidation_handler.h" -#include "components/invalidation/fake_invalidation_state_tracker.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/fake_invalidation_handler.h" +#include "sync/notifier/fake_invalidation_state_tracker.h" #include "sync/notifier/invalidator.h" #include "testing/gtest/include/gtest/gtest.h" @@ -374,4 +374,4 @@ REGISTER_TYPED_TEST_CASE_P(InvalidatorTest, } // namespace syncer -#endif // COMPONENTS_INVALIDATION_INVALIDATOR_TEST_TEMPLATE_H_ +#endif // SYNC_NOTIFIER_INVALIDATOR_TEST_TEMPLATE_H_ diff --git a/components/invalidation/non_blocking_invalidator.cc b/sync/notifier/non_blocking_invalidator.cc index 401ae90..b155c35 100644 --- a/components/invalidation/non_blocking_invalidator.cc +++ b/sync/notifier/non_blocking_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 "components/invalidation/non_blocking_invalidator.h" +#include "sync/notifier/non_blocking_invalidator.h" #include <cstddef> @@ -12,13 +12,13 @@ #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" #include "base/threading/thread.h" -#include "components/invalidation/gcm_network_channel_delegate.h" -#include "components/invalidation/invalidation_notifier.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/gcm_network_channel_delegate.h" #include "sync/notifier/invalidation_handler.h" +#include "sync/notifier/invalidation_notifier.h" #include "sync/notifier/object_id_invalidation_map.h" +#include "sync/notifier/sync_system_resources.h" namespace syncer { diff --git a/components/invalidation/non_blocking_invalidator.h b/sync/notifier/non_blocking_invalidator.h index f396796..d08dfb9 100644 --- a/components/invalidation/non_blocking_invalidator.h +++ b/sync/notifier/non_blocking_invalidator.h @@ -5,8 +5,8 @@ // An implementation of SyncNotifier that wraps InvalidationNotifier // on its own thread. -#ifndef COMPONENTS_INVALIDATION_NON_BLOCKING_INVALIDATOR_H_ -#define COMPONENTS_INVALIDATION_NON_BLOCKING_INVALIDATOR_H_ +#ifndef SYNC_NOTIFIER_NON_BLOCKING_INVALIDATOR_H_ +#define SYNC_NOTIFIER_NON_BLOCKING_INVALIDATOR_H_ #include <string> @@ -15,12 +15,12 @@ #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" -#include "components/invalidation/invalidation_export.h" -#include "components/invalidation/invalidator_registrar.h" #include "jingle/notifier/base/notifier_options.h" -#include "sync/internal_api/public/base/invalidator_state.h" +#include "sync/base/sync_export.h" #include "sync/notifier/invalidation_state_tracker.h" #include "sync/notifier/invalidator.h" +#include "sync/notifier/invalidator_registrar.h" +#include "sync/notifier/invalidator_state.h" #include "sync/notifier/unacked_invalidation_set.h" namespace base { @@ -36,7 +36,7 @@ class GCMNetworkChannelDelegate; typedef base::Callback<scoped_ptr<SyncNetworkChannel>(void)> NetworkChannelCreator; -class INVALIDATION_EXPORT_PRIVATE NonBlockingInvalidator +class SYNC_EXPORT_PRIVATE NonBlockingInvalidator : public Invalidator, public InvalidationStateTracker { public: @@ -111,4 +111,4 @@ class INVALIDATION_EXPORT_PRIVATE NonBlockingInvalidator } // namespace syncer -#endif // COMPONENTS_INVALIDATION_NON_BLOCKING_INVALIDATOR_H_ +#endif // SYNC_NOTIFIER_NON_BLOCKING_INVALIDATOR_H_ diff --git a/components/invalidation/non_blocking_invalidator_unittest.cc b/sync/notifier/non_blocking_invalidator_unittest.cc index c874b54..47043ec 100644 --- a/components/invalidation/non_blocking_invalidator_unittest.cc +++ b/sync/notifier/non_blocking_invalidator_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "components/invalidation/non_blocking_invalidator.h" +#include "sync/notifier/non_blocking_invalidator.h" #include "base/bind_helpers.h" #include "base/memory/ref_counted.h" @@ -10,12 +10,12 @@ #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "base/threading/thread.h" -#include "components/invalidation/fake_invalidation_handler.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/fake_invalidation_handler.h" #include "sync/notifier/invalidation_state_tracker.h" +#include "sync/notifier/invalidator_test_template.h" #include "testing/gtest/include/gtest/gtest.h" namespace syncer { diff --git a/components/invalidation/p2p_invalidator.cc b/sync/notifier/p2p_invalidator.cc index 9ea384f..1eb0596 100644 --- a/components/invalidation/p2p_invalidator.cc +++ b/sync/notifier/p2p_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 "components/invalidation/p2p_invalidator.h" +#include "sync/notifier/p2p_invalidator.h" #include <algorithm> #include <iterator> @@ -11,7 +11,6 @@ #include "base/json/json_writer.h" #include "base/logging.h" #include "base/values.h" -#include "components/invalidation/notifier_reason_util.h" #include "jingle/notifier/listener/push_client.h" #include "sync/notifier/invalidation_handler.h" #include "sync/notifier/invalidation_util.h" diff --git a/components/invalidation/p2p_invalidator.h b/sync/notifier/p2p_invalidator.h index 38c8254..8132d8c 100644 --- a/components/invalidation/p2p_invalidator.h +++ b/sync/notifier/p2p_invalidator.h @@ -5,8 +5,8 @@ // An invalidator that uses p2p invalidations based on XMPP push // notifications. Used only for sync integration tests. -#ifndef COMPONENTS_INVALIDATION_P2P_INVALIDATOR_H_ -#define COMPONENTS_INVALIDATION_P2P_INVALIDATOR_H_ +#ifndef SYNC_NOTIFIER_P2P_INVALIDATOR_H_ +#define SYNC_NOTIFIER_P2P_INVALIDATOR_H_ #include <string> @@ -16,14 +16,14 @@ #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/threading/thread_checker.h" -#include "components/invalidation/invalidation_export.h" -#include "components/invalidation/invalidator_registrar.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/base/sync_export.h" #include "sync/internal_api/public/base/model_type.h" #include "sync/notifier/invalidator.h" +#include "sync/notifier/invalidator_registrar.h" +#include "sync/notifier/invalidator_state.h" #include "sync/notifier/object_id_invalidation_map.h" namespace notifier { @@ -33,7 +33,7 @@ class PushClient; namespace syncer { // The channel to use for sync notifications. -INVALIDATION_EXPORT extern const char kSyncP2PNotificationChannel[]; +SYNC_EXPORT extern const char kSyncP2PNotificationChannel[]; // The intended recipient(s) of a P2P notification. enum P2PNotificationTarget { @@ -44,16 +44,16 @@ enum P2PNotificationTarget { LAST_NOTIFICATION_TARGET = NOTIFY_ALL }; -INVALIDATION_EXPORT_PRIVATE std::string P2PNotificationTargetToString( +SYNC_EXPORT_PRIVATE std::string P2PNotificationTargetToString( P2PNotificationTarget target); // If |target_str| can't be parsed, assumes NOTIFY_SELF. -INVALIDATION_EXPORT_PRIVATE P2PNotificationTarget -P2PNotificationTargetFromString(const std::string& target_str); +SYNC_EXPORT_PRIVATE P2PNotificationTarget P2PNotificationTargetFromString( + const std::string& target_str); // Helper notification data class that can be serialized to and // deserialized from a string. -class INVALIDATION_EXPORT_PRIVATE P2PNotificationData { +class SYNC_EXPORT_PRIVATE P2PNotificationData { public: // Initializes with an empty sender ID, target set to NOTIFY_SELF, // and empty changed types. @@ -86,7 +86,7 @@ class INVALIDATION_EXPORT_PRIVATE P2PNotificationData { ObjectIdInvalidationMap invalidation_map_; }; -class INVALIDATION_EXPORT_PRIVATE P2PInvalidator +class SYNC_EXPORT_PRIVATE P2PInvalidator : public Invalidator, public NON_EXPORTED_BASE(notifier::PushClientObserver) { public: @@ -147,4 +147,4 @@ class INVALIDATION_EXPORT_PRIVATE P2PInvalidator } // namespace syncer -#endif // COMPONENTS_INVALIDATION_P2P_INVALIDATOR_H_ +#endif // SYNC_NOTIFIER_P2P_INVALIDATOR_H_ diff --git a/components/invalidation/p2p_invalidator_unittest.cc b/sync/notifier/p2p_invalidator_unittest.cc index 150a91a..9f0b273 100644 --- a/components/invalidation/p2p_invalidator_unittest.cc +++ b/sync/notifier/p2p_invalidator_unittest.cc @@ -2,16 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "components/invalidation/p2p_invalidator.h" +#include "sync/notifier/p2p_invalidator.h" #include <cstddef> -#include "components/invalidation/fake_invalidation_handler.h" -#include "components/invalidation/invalidator_test_template.h" -#include "components/invalidation/notifier_reason_util.h" #include "jingle/notifier/listener/fake_push_client.h" -#include "sync/internal_api/public/base/invalidator_state.h" #include "sync/internal_api/public/base/model_type.h" +#include "sync/notifier/fake_invalidation_handler.h" +#include "sync/notifier/invalidator_test_template.h" #include "testing/gtest/include/gtest/gtest.h" namespace syncer { diff --git a/components/invalidation/push_client_channel.cc b/sync/notifier/push_client_channel.cc index 3d12d48..0bd07c9 100644 --- a/components/invalidation/push_client_channel.cc +++ b/sync/notifier/push_client_channel.cc @@ -2,10 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "components/invalidation/push_client_channel.h" +#include "sync/notifier/push_client_channel.h" #include "base/stl_util.h" -#include "components/invalidation/notifier_reason_util.h" #include "google/cacheinvalidation/client_gateway.pb.h" #include "google/cacheinvalidation/types.pb.h" #include "jingle/notifier/listener/push_client.h" diff --git a/components/invalidation/push_client_channel.h b/sync/notifier/push_client_channel.h index 37146a3..b3e4bf2 100644 --- a/components/invalidation/push_client_channel.h +++ b/sync/notifier/push_client_channel.h @@ -2,17 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef COMPONENTS_INVALIDATION_PUSH_CLIENT_CHANNEL_H_ -#define COMPONENTS_INVALIDATION_PUSH_CLIENT_CHANNEL_H_ +#ifndef SYNC_NOTIFIER_PUSH_CLIENT_CHANNEL_H_ +#define SYNC_NOTIFIER_PUSH_CLIENT_CHANNEL_H_ #include <string> #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "components/invalidation/invalidation_export.h" -#include "components/invalidation/sync_system_resources.h" #include "jingle/notifier/listener/push_client_observer.h" +#include "sync/base/sync_export.h" +#include "sync/notifier/sync_system_resources.h" namespace notifier { class PushClient; @@ -22,7 +22,7 @@ namespace syncer { // A PushClientChannel is an implementation of NetworkChannel that // routes messages through a PushClient. -class INVALIDATION_EXPORT_PRIVATE PushClientChannel +class SYNC_EXPORT_PRIVATE PushClientChannel : public SyncNetworkChannel, public NON_EXPORTED_BASE(notifier::PushClientObserver) { public: @@ -88,4 +88,4 @@ class INVALIDATION_EXPORT_PRIVATE PushClientChannel } // namespace syncer -#endif // COMPONENTS_INVALIDATION_PUSH_CLIENT_CHANNEL_H_ +#endif // SYNC_NOTIFIER_PUSH_CLIENT_CHANNEL_H_ diff --git a/components/invalidation/push_client_channel_unittest.cc b/sync/notifier/push_client_channel_unittest.cc index 2d5fd44..e58d20b 100644 --- a/components/invalidation/push_client_channel_unittest.cc +++ b/sync/notifier/push_client_channel_unittest.cc @@ -5,9 +5,9 @@ #include <string> #include "base/compiler_specific.h" -#include "components/invalidation/push_client_channel.h" #include "jingle/notifier/listener/fake_push_client.h" #include "jingle/notifier/listener/notification_defines.h" +#include "sync/notifier/push_client_channel.h" #include "testing/gtest/include/gtest/gtest.h" namespace syncer { diff --git a/components/invalidation/state_writer.h b/sync/notifier/state_writer.h index 4710e7c..d008fee 100644 --- a/components/invalidation/state_writer.h +++ b/sync/notifier/state_writer.h @@ -4,16 +4,16 @@ // // Simple interface for something that persists state. -#ifndef COMPONENTS_INVALIDATION_STATE_WRITER_H_ -#define COMPONENTS_INVALIDATION_STATE_WRITER_H_ +#ifndef SYNC_NOTIFIER_STATE_WRITER_H_ +#define SYNC_NOTIFIER_STATE_WRITER_H_ #include <string> -#include "components/invalidation/invalidation_export.h" +#include "sync/base/sync_export.h" namespace syncer { -class INVALIDATION_EXPORT_PRIVATE StateWriter { +class SYNC_EXPORT_PRIVATE StateWriter { public: virtual ~StateWriter() {} @@ -22,4 +22,4 @@ class INVALIDATION_EXPORT_PRIVATE StateWriter { } // namespace syncer -#endif // COMPONENTS_INVALIDATION_STATE_WRITER_H_ +#endif // SYNC_NOTIFIER_STATE_WRITER_H_ diff --git a/components/invalidation/sync_invalidation_listener.cc b/sync/notifier/sync_invalidation_listener.cc index ea9461c..ddf4233 100644 --- a/components/invalidation/sync_invalidation_listener.cc +++ b/sync/notifier/sync_invalidation_listener.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 "components/invalidation/sync_invalidation_listener.h" +#include "sync/notifier/sync_invalidation_listener.h" #include <vector> diff --git a/components/invalidation/sync_invalidation_listener.h b/sync/notifier/sync_invalidation_listener.h index 91afc0f..93bc0a5 100644 --- a/components/invalidation/sync_invalidation_listener.h +++ b/sync/notifier/sync_invalidation_listener.h @@ -5,8 +5,8 @@ // A simple wrapper around invalidation::InvalidationClient that // handles all the startup/shutdown details and hookups. -#ifndef COMPONENTS_INVALIDATION_SYNC_INVALIDATION_LISTENER_H_ -#define COMPONENTS_INVALIDATION_SYNC_INVALIDATION_LISTENER_H_ +#ifndef SYNC_NOTIFIER_SYNC_INVALIDATION_LISTENER_H_ +#define SYNC_NOTIFIER_SYNC_INVALIDATION_LISTENER_H_ #include <string> @@ -16,14 +16,14 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/threading/non_thread_safe.h" -#include "components/invalidation/invalidation_export.h" -#include "components/invalidation/state_writer.h" -#include "components/invalidation/sync_system_resources.h" #include "google/cacheinvalidation/include/invalidation-listener.h" -#include "sync/internal_api/public/base/invalidator_state.h" +#include "sync/base/sync_export.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/invalidator_state.h" +#include "sync/notifier/state_writer.h" +#include "sync/notifier/sync_system_resources.h" #include "sync/notifier/unacked_invalidation_set.h" namespace buzz { @@ -41,7 +41,7 @@ class RegistrationManager; // SyncInvalidationListener is not thread-safe and lives on the sync // thread. -class INVALIDATION_EXPORT_PRIVATE SyncInvalidationListener +class SYNC_EXPORT_PRIVATE SyncInvalidationListener : public NON_EXPORTED_BASE(invalidation::InvalidationListener), public StateWriter, public SyncNetworkChannel::Observer, @@ -55,7 +55,7 @@ class INVALIDATION_EXPORT_PRIVATE SyncInvalidationListener const invalidation::string&, invalidation::InvalidationListener*)> CreateInvalidationClientCallback; - class INVALIDATION_EXPORT_PRIVATE Delegate { + class SYNC_EXPORT_PRIVATE Delegate { public: virtual ~Delegate(); @@ -193,4 +193,4 @@ class INVALIDATION_EXPORT_PRIVATE SyncInvalidationListener } // namespace syncer -#endif // COMPONENTS_INVALIDATION_SYNC_INVALIDATION_LISTENER_H_ +#endif // SYNC_NOTIFIER_SYNC_INVALIDATION_LISTENER_H_ diff --git a/components/invalidation/sync_invalidation_listener_unittest.cc b/sync/notifier/sync_invalidation_listener_unittest.cc index f7ff05a..dbf5fd3 100644 --- a/components/invalidation/sync_invalidation_listener_unittest.cc +++ b/sync/notifier/sync_invalidation_listener_unittest.cc @@ -11,16 +11,16 @@ #include "base/compiler_specific.h" #include "base/message_loop/message_loop.h" #include "base/stl_util.h" -#include "components/invalidation/fake_invalidation_state_tracker.h" -#include "components/invalidation/push_client_channel.h" -#include "components/invalidation/sync_invalidation_listener.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/util/weak_handle.h" #include "sync/notifier/dropped_invalidation_tracker.h" +#include "sync/notifier/fake_invalidation_state_tracker.h" #include "sync/notifier/invalidation_util.h" #include "sync/notifier/object_id_invalidation_map.h" +#include "sync/notifier/push_client_channel.h" +#include "sync/notifier/sync_invalidation_listener.h" #include "sync/notifier/unacked_invalidation_set_test_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/invalidation/sync_system_resources.cc b/sync/notifier/sync_system_resources.cc index 1e7f3d4..5df110d 100644 --- a/components/invalidation/sync_system_resources.cc +++ b/sync/notifier/sync_system_resources.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "components/invalidation/sync_system_resources.h" +#include "sync/notifier/sync_system_resources.h" #include <cstdlib> #include <cstring> @@ -14,13 +14,13 @@ #include "base/stl_util.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" -#include "components/invalidation/gcm_network_channel.h" -#include "components/invalidation/gcm_network_channel_delegate.h" -#include "components/invalidation/push_client_channel.h" #include "google/cacheinvalidation/deps/callback.h" #include "google/cacheinvalidation/include/types.h" #include "jingle/notifier/listener/push_client.h" +#include "sync/notifier/gcm_network_channel.h" +#include "sync/notifier/gcm_network_channel_delegate.h" #include "sync/notifier/invalidation_util.h" +#include "sync/notifier/push_client_channel.h" namespace syncer { diff --git a/components/invalidation/sync_system_resources.h b/sync/notifier/sync_system_resources.h index cbc0dc2..ebddccf 100644 --- a/components/invalidation/sync_system_resources.h +++ b/sync/notifier/sync_system_resources.h @@ -6,8 +6,8 @@ // for scheduling. Assumes the current message loop is already // running. -#ifndef COMPONENTS_INVALIDATION_SYNC_SYSTEM_RESOURCES_H_ -#define COMPONENTS_INVALIDATION_SYNC_SYSTEM_RESOURCES_H_ +#ifndef SYNC_NOTIFIER_SYNC_SYSTEM_RESOURCES_H_ +#define SYNC_NOTIFIER_SYNC_SYSTEM_RESOURCES_H_ #include <set> #include <string> @@ -19,11 +19,11 @@ #include "base/message_loop/message_loop.h" #include "base/threading/non_thread_safe.h" #include "base/values.h" -#include "components/invalidation/invalidation_export.h" -#include "components/invalidation/state_writer.h" #include "google/cacheinvalidation/include/system-resources.h" #include "jingle/notifier/base/notifier_options.h" -#include "sync/internal_api/public/base/invalidator_state.h" +#include "sync/base/sync_export.h" +#include "sync/notifier/invalidator_state.h" +#include "sync/notifier/state_writer.h" namespace syncer { @@ -84,7 +84,7 @@ class SyncInvalidationScheduler : public invalidation::Scheduler { // - notifying observers about network channel state change // Implementation of particular network protocol should implement // SendMessage and call NotifyStateChange and DeliverIncomingMessage. -class INVALIDATION_EXPORT_PRIVATE SyncNetworkChannel +class SYNC_EXPORT_PRIVATE SyncNetworkChannel : public NON_EXPORTED_BASE(invalidation::NetworkChannel) { public: class Observer { @@ -205,7 +205,7 @@ class SyncStorage : public invalidation::Storage { std::string cached_state_; }; -class INVALIDATION_EXPORT_PRIVATE SyncSystemResources +class SYNC_EXPORT_PRIVATE SyncSystemResources : public NON_EXPORTED_BASE(invalidation::SystemResources) { public: SyncSystemResources(SyncNetworkChannel* sync_network_channel, @@ -238,4 +238,4 @@ class INVALIDATION_EXPORT_PRIVATE SyncSystemResources } // namespace syncer -#endif // COMPONENTS_INVALIDATION_SYNC_SYSTEM_RESOURCES_H_ +#endif // SYNC_NOTIFIER_SYNC_SYSTEM_RESOURCES_H_ diff --git a/components/invalidation/sync_system_resources_unittest.cc b/sync/notifier/sync_system_resources_unittest.cc index 705ba0b..1cbf964 100644 --- a/components/invalidation/sync_system_resources_unittest.cc +++ b/sync/notifier/sync_system_resources_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "components/invalidation/sync_system_resources.h" +#include "sync/notifier/sync_system_resources.h" #include <string> @@ -11,10 +11,10 @@ #include "base/callback.h" #include "base/message_loop/message_loop.h" -#include "components/invalidation/push_client_channel.h" -#include "components/invalidation/state_writer.h" #include "google/cacheinvalidation/include/types.h" #include "jingle/notifier/listener/fake_push_client.h" +#include "sync/notifier/push_client_channel.h" +#include "sync/notifier/state_writer.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/sync/notifier/unacked_invalidation_set.cc b/sync/notifier/unacked_invalidation_set.cc index d1d913c..6991fc0 100644 --- a/sync/notifier/unacked_invalidation_set.cc +++ b/sync/notifier/unacked_invalidation_set.cc @@ -7,6 +7,7 @@ #include "base/strings/string_number_conversions.h" #include "sync/internal_api/public/base/ack_handle.h" #include "sync/notifier/object_id_invalidation_map.h" +#include "sync/notifier/sync_invalidation_listener.h" namespace { diff --git a/sync/sync_internal_api.gypi b/sync/sync_internal_api.gypi index f0ae375..f248552 100644 --- a/sync/sync_internal_api.gypi +++ b/sync/sync_internal_api.gypi @@ -64,8 +64,6 @@ 'internal_api/public/base/enum_set.h', 'internal_api/public/base/invalidation.cc', 'internal_api/public/base/invalidation.h', - 'internal_api/public/base/invalidator_state.cc', - 'internal_api/public/base/invalidator_state.h', 'internal_api/public/base/model_type.h', 'internal_api/public/base/node_ordinal.cc', 'internal_api/public/base/node_ordinal.h', diff --git a/sync/sync_notifier.gypi b/sync/sync_notifier.gypi index 9c6dc38..f8e9d5c 100644 --- a/sync/sync_notifier.gypi +++ b/sync/sync_notifier.gypi @@ -28,13 +28,16 @@ 'notifier/dropped_invalidation_tracker.cc', 'notifier/dropped_invalidation_tracker.h', '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.h', + 'notifier/invalidator_registrar.cc', + 'notifier/invalidator_registrar.h', + 'notifier/invalidator_state.cc', + 'notifier/invalidator_state.h', 'notifier/mock_ack_handler.cc', 'notifier/mock_ack_handler.h', 'notifier/object_id_invalidation_map.cc', @@ -45,8 +48,24 @@ 'conditions': [ ['OS != "android"', { 'sources': [ + 'notifier/gcm_network_channel.cc', + 'notifier/gcm_network_channel.h', + 'notifier/gcm_network_channel_delegate.h', + 'notifier/invalidation_notifier.cc', + 'notifier/invalidation_notifier.h', + 'notifier/non_blocking_invalidator.cc', + 'notifier/non_blocking_invalidator.h', + 'notifier/p2p_invalidator.cc', + 'notifier/p2p_invalidator.h', + 'notifier/push_client_channel.cc', + 'notifier/push_client_channel.h', 'notifier/registration_manager.cc', 'notifier/registration_manager.h', + 'notifier/state_writer.h', + 'notifier/sync_invalidation_listener.cc', + 'notifier/sync_invalidation_listener.h', + 'notifier/sync_system_resources.cc', + 'notifier/sync_system_resources.h', ], }], ], diff --git a/sync/sync_tests.gypi b/sync/sync_tests.gypi index e92d6c4..cd4f933 100644 --- a/sync/sync_tests.gypi +++ b/sync/sync_tests.gypi @@ -159,6 +159,14 @@ 'sync', ], 'sources': [ + 'notifier/fake_invalidation_handler.cc', + 'notifier/fake_invalidation_handler.h', + 'notifier/fake_invalidation_state_tracker.cc', + 'notifier/fake_invalidation_state_tracker.h', + 'notifier/fake_invalidator.cc', + 'notifier/fake_invalidator.h', + 'notifier/invalidator_test_template.cc', + 'notifier/invalidator_test_template.h', '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', @@ -366,9 +374,18 @@ 'conditions': [ ['OS != "android"', { 'sources': [ + 'notifier/fake_invalidator_unittest.cc', + 'notifier/gcm_network_channel_unittest.cc', + 'notifier/invalidation_notifier_unittest.cc', + 'notifier/invalidator_registrar_unittest.cc', + 'notifier/non_blocking_invalidator_unittest.cc', 'notifier/object_id_invalidation_map_unittest.cc', + 'notifier/p2p_invalidator_unittest.cc', + 'notifier/push_client_channel_unittest.cc', 'notifier/registration_manager_unittest.cc', 'notifier/single_object_invalidation_set_unittest.cc', + 'notifier/sync_invalidation_listener_unittest.cc', + 'notifier/sync_system_resources_unittest.cc', 'notifier/unacked_invalidation_set_unittest.cc', ], }], diff --git a/sync/tools/DEPS b/sync/tools/DEPS index ac34026..322ec26 100644 --- a/sync/tools/DEPS +++ b/sync/tools/DEPS @@ -1,5 +1,4 @@ include_rules = [ - "+components/invalidation", "+jingle/notifier/base", "+net", "+sync/internal_api/public", diff --git a/sync/tools/sync_client.cc b/sync/tools/sync_client.cc index a5890cf..8edd6fa 100644 --- a/sync/tools/sync_client.cc +++ b/sync/tools/sync_client.cc @@ -20,7 +20,6 @@ #include "base/rand_util.h" #include "base/task_runner.h" #include "base/threading/thread.h" -#include "components/invalidation/non_blocking_invalidator.h" #include "jingle/notifier/base/notification_method.h" #include "jingle/notifier/base/notifier_options.h" #include "net/base/host_port_pair.h" @@ -42,6 +41,7 @@ #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/non_blocking_invalidator.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 e924e53..6a9a505 100644 --- a/sync/tools/sync_listen_notifications.cc +++ b/sync/tools/sync_listen_notifications.cc @@ -15,7 +15,6 @@ #include "base/message_loop/message_loop.h" #include "base/rand_util.h" #include "base/threading/thread.h" -#include "components/invalidation/non_blocking_invalidator.h" #include "jingle/notifier/base/notification_method.h" #include "jingle/notifier/base/notifier_options.h" #include "net/base/host_port_pair.h" @@ -28,6 +27,7 @@ #include "sync/notifier/invalidation_state_tracker.h" #include "sync/notifier/invalidation_util.h" #include "sync/notifier/invalidator.h" +#include "sync/notifier/non_blocking_invalidator.h" #include "sync/notifier/object_id_invalidation_map.h" #include "sync/tools/null_invalidation_state_tracker.h" diff --git a/sync/tools/sync_tools.gyp b/sync/tools/sync_tools.gyp index 20ca8ec..7cc8352 100644 --- a/sync/tools/sync_tools.gyp +++ b/sync/tools/sync_tools.gyp @@ -39,7 +39,6 @@ ], 'dependencies': [ '../../base/base.gyp:base', - '../../components/components.gyp:invalidation', '../../jingle/jingle.gyp:notifier', '../../net/net.gyp:net', '../../net/net.gyp:net_test_support', @@ -60,7 +59,6 @@ ], 'dependencies': [ '../../base/base.gyp:base', - '../../components/components.gyp:invalidation', '../../jingle/jingle.gyp:notifier', '../../net/net.gyp:net', '../../net/net.gyp:net_test_support', |