diff options
author | rlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-17 19:28:46 +0000 |
---|---|---|
committer | rlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-17 19:28:46 +0000 |
commit | 001bbfdc4da9f8aec8e1a30770a1e4cef2347e0a (patch) | |
tree | 1017f4628ef475caaf86573c9c8ec2e7aa341997 /sync/tools | |
parent | cb363e702cb70f99c707be975e57015b438eaef0 (diff) | |
download | chromium_src-001bbfdc4da9f8aec8e1a30770a1e4cef2347e0a.zip chromium_src-001bbfdc4da9f8aec8e1a30770a1e4cef2347e0a.tar.gz chromium_src-001bbfdc4da9f8aec8e1a30770a1e4cef2347e0a.tar.bz2 |
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
Diffstat (limited to 'sync/tools')
-rw-r--r-- | sync/tools/DEPS | 1 | ||||
-rw-r--r-- | sync/tools/null_invalidation_state_tracker.cc | 2 | ||||
-rw-r--r-- | sync/tools/null_invalidation_state_tracker.h | 2 | ||||
-rw-r--r-- | sync/tools/sync_client.cc | 2 | ||||
-rw-r--r-- | sync/tools/sync_listen_notifications.cc | 10 | ||||
-rw-r--r-- | sync/tools/sync_tools.gyp | 1 |
6 files changed, 9 insertions, 9 deletions
diff --git a/sync/tools/DEPS b/sync/tools/DEPS index ac34026..ec5c93e 100644 --- a/sync/tools/DEPS +++ b/sync/tools/DEPS @@ -4,7 +4,6 @@ include_rules = [ "+net", "+sync/internal_api/public", "+sync/js", - "+sync/notifier", # TODO(akalin): Remove this when we use the system encryptor. "+sync/test/fake_encryptor.h", ] diff --git a/sync/tools/null_invalidation_state_tracker.cc b/sync/tools/null_invalidation_state_tracker.cc index d7f949f..24e8655 100644 --- a/sync/tools/null_invalidation_state_tracker.cc +++ b/sync/tools/null_invalidation_state_tracker.cc @@ -10,7 +10,7 @@ #include "base/location.h" #include "base/logging.h" #include "base/task_runner.h" -#include "sync/notifier/invalidation_util.h" +#include "sync/internal_api/public/base/invalidation_util.h" namespace syncer { diff --git a/sync/tools/null_invalidation_state_tracker.h b/sync/tools/null_invalidation_state_tracker.h index a08fe7d..140ee3f 100644 --- a/sync/tools/null_invalidation_state_tracker.h +++ b/sync/tools/null_invalidation_state_tracker.h @@ -7,7 +7,7 @@ #include "base/compiler_specific.h" #include "base/memory/weak_ptr.h" -#include "sync/notifier/invalidation_state_tracker.h" +#include "components/invalidation/invalidation_state_tracker.h" namespace syncer { diff --git a/sync/tools/sync_client.cc b/sync/tools/sync_client.cc index 6813823..ca34f85 100644 --- a/sync/tools/sync_client.cc +++ b/sync/tools/sync_client.cc @@ -21,6 +21,7 @@ #include "base/task_runner.h" #include "base/threading/thread.h" #include "components/invalidation/non_blocking_invalidator.h" +#include "components/invalidation/object_id_invalidation_map.h" #include "jingle/notifier/base/notification_method.h" #include "jingle/notifier/base/notifier_options.h" #include "net/base/host_port_pair.h" @@ -42,7 +43,6 @@ #include "sync/internal_api/public/util/weak_handle.h" #include "sync/js/js_event_details.h" #include "sync/js/js_event_handler.h" -#include "sync/notifier/object_id_invalidation_map.h" #include "sync/test/fake_encryptor.h" #include "sync/tools/null_invalidation_state_tracker.h" diff --git a/sync/tools/sync_listen_notifications.cc b/sync/tools/sync_listen_notifications.cc index 7a3279b..996647f 100644 --- a/sync/tools/sync_listen_notifications.cc +++ b/sync/tools/sync_listen_notifications.cc @@ -15,7 +15,11 @@ #include "base/message_loop/message_loop.h" #include "base/rand_util.h" #include "base/threading/thread.h" +#include "components/invalidation/invalidation_handler.h" +#include "components/invalidation/invalidation_state_tracker.h" +#include "components/invalidation/invalidator.h" #include "components/invalidation/non_blocking_invalidator.h" +#include "components/invalidation/object_id_invalidation_map.h" #include "jingle/notifier/base/notification_method.h" #include "jingle/notifier/base/notifier_options.h" #include "net/base/host_port_pair.h" @@ -23,12 +27,8 @@ #include "net/dns/host_resolver.h" #include "net/http/transport_security_state.h" #include "net/url_request/url_request_test_util.h" +#include "sync/internal_api/public/base/invalidation_util.h" #include "sync/internal_api/public/base/model_type.h" -#include "sync/notifier/invalidation_handler.h" -#include "sync/notifier/invalidation_state_tracker.h" -#include "sync/notifier/invalidation_util.h" -#include "sync/notifier/invalidator.h" -#include "sync/notifier/object_id_invalidation_map.h" #include "sync/tools/null_invalidation_state_tracker.h" #if defined(OS_MACOSX) diff --git a/sync/tools/sync_tools.gyp b/sync/tools/sync_tools.gyp index 20ca8ec..e6797b5 100644 --- a/sync/tools/sync_tools.gyp +++ b/sync/tools/sync_tools.gyp @@ -19,6 +19,7 @@ ], 'dependencies': [ '../../base/base.gyp:base', + '../../components/components.gyp:invalidation', '../sync.gyp:sync', ], 'export_dependent_settings': [ |