diff options
author | rlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-02 22:17:50 +0000 |
---|---|---|
committer | rlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-02 22:17:50 +0000 |
commit | 24c9ee594694a646eec1e5028cdd088cf4d73f9d (patch) | |
tree | ce7cbdceee342e9af83a5002814d3481f800561a /sync/tools | |
parent | 4d488032475256413d3aa347407b77f21ca11633 (diff) | |
download | chromium_src-24c9ee594694a646eec1e5028cdd088cf4d73f9d.zip chromium_src-24c9ee594694a646eec1e5028cdd088cf4d73f9d.tar.gz chromium_src-24c9ee594694a646eec1e5028cdd088cf4d73f9d.tar.bz2 |
Move some sync/notifier to components/invalidation
Moves many of the files in sync/notifier to components/invalidation.
This change does not introduce any new dependencies. The relevant
dependency rules both before and after this change should be:
- chrome/browser/invalidation and chrome in general depend on
components/invalidation.
- components/invalidation depends on sync/notifier and sync in
general.
- sync/notifier, components/invalidation, and various parts of
chrome all depend on sync/internal_api/public.
The eventual goal is to move all of sync/notifier into
components/invalidation. The invalidation-related parts of
sync/internal_api/public should be moved to components/invalidation,
too. This will allow us to remove the deopendencies from
components/invalidation to sync, and remove sync's dependencies on
cacheinvalidation and libjingle.
This change is a regression in terms of shared library componentization.
the files in the sync/notifier folder could be built as a shared
library. The files in compononents/invalidation do not support this
yet. The SYNC_EXPORT declarations in the moved files have been changed
to INVALIDATION_EXPORT so as to not lose this information, but the
macros are currently #defined to no-ops.
This change does not attempt to rename any classes or namespaces.
Many of the files ported from sync/notifier still use the syncer
namespace. Some, like SyncSystemResources, still have names tied
to their sync heritage. This will be addressed in future CLs.
Some non-trivial or non-obvious changes include:
- invalidator_state.h was moved to sync/internal_api/public/base so it
could be shared by both sync/ and components/invalidation. This should
be fixed in a future CL.
- FromNotifierReason was split out of invalidator_state.h and moved to
the newly-created components/invalidator_reason_util.h
TBR=zea,rtenneti,mallinath,dcheng
BUG=259559
Review URL: https://codereview.chromium.org/294123004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274350 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/tools')
-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 |
4 files changed, 5 insertions, 2 deletions
diff --git a/sync/tools/DEPS b/sync/tools/DEPS index 322ec26..ac34026 100644 --- a/sync/tools/DEPS +++ b/sync/tools/DEPS @@ -1,4 +1,5 @@ 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 8edd6fa..a5890cf 100644 --- a/sync/tools/sync_client.cc +++ b/sync/tools/sync_client.cc @@ -20,6 +20,7 @@ #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" @@ -41,7 +42,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/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 6a9a505..e924e53 100644 --- a/sync/tools/sync_listen_notifications.cc +++ b/sync/tools/sync_listen_notifications.cc @@ -15,6 +15,7 @@ #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" @@ -27,7 +28,6 @@ #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 7cc8352..20ca8ec 100644 --- a/sync/tools/sync_tools.gyp +++ b/sync/tools/sync_tools.gyp @@ -39,6 +39,7 @@ ], 'dependencies': [ '../../base/base.gyp:base', + '../../components/components.gyp:invalidation', '../../jingle/jingle.gyp:notifier', '../../net/net.gyp:net', '../../net/net.gyp:net_test_support', @@ -59,6 +60,7 @@ ], 'dependencies': [ '../../base/base.gyp:base', + '../../components/components.gyp:invalidation', '../../jingle/jingle.gyp:notifier', '../../net/net.gyp:net', '../../net/net.gyp:net_test_support', |