Move sync/notifier to components/invalidation

Moves all code remaining in sync/notifier to components/invalidation.
Updates gyp files, DEPS, and #includes accordingly.

In terms of program behavior, this should be one big no-op.  This CL
contains no non-trivial code changes.

In terms of the build system, this is a significant change.  Symbols
that were previously exported through sync_notifier and related targets
have moved into the components/invalidation related targets.  Some
SYNC_EXPORT macros have been replaced with INVALIDATION_EXPORT, which is
significant since INVALIDATION_EXPORT is currently a no-op but
SYNC_EXPORT has meaning under some build configurations.

Unlike most other files in sync/notifier, invalidation_util.{cc,h} was
moved to sync/internal_api/public/base.  This is so it could be
referenced from sync/internal_api/public/base/invalidation.cc.  This is
a slight regression, but it should be fixed in the next CL when we move
all invalidations-related code out of sync/internal_api.

TBR=rogerta,benwells
BUG=259559

Review URL: https://codereview.chromium.org/387733004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283840 0039d316-1c4b-4281-b951-d872f2087c98

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",

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;
 

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 {
 

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;
 

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",
 ]

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 {
 

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;

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"
 

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 {
 

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;

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 {
 

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 {
 

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 {

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"

chrome/browser/invalidation/ticl_profile_settings_provider_unittest.cc

@@ -12,14 +12,14 @@
 #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"
 #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/invalidation_state_tracker.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace invalidation {

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",
   ],
 }

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 {
 

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;

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"
 

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",

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",

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.

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.

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"

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;

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;

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 {

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",

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;

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;
 

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',

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', {