Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(737)

Issue 294123004: Move some sync/notifier to components/invalidation (Closed)

Created:
6 years, 7 months ago by rlarocque
Modified:
6 years, 6 months ago
CC:
chromium-reviews, tim+watch_chromium.org, chromium-apps-reviews_chromium.org, maniscalco+watch_chromium.org, haitaol+watch_chromium.org, extensions-reviews_chromium.org
Visibility:
Public.

Description

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 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=274350

Patch Set 1 #

Patch Set 2 : Rebase #

Patch Set 3 : Fix double-declare in gyp file #

Patch Set 4 : Another gyp change to try to fix Android build #

Patch Set 5 : Rebase #

Patch Set 6 : Move some InvalidationStateTracker functions to .cc file #

Patch Set 7 : Rebase + add missing file #

Patch Set 8 : Rebase on top of r273665 #

Patch Set 9 : Rebase #

Unified diffs Side-by-side diffs Delta from patch set Stats (+314 lines, -7422 lines) Patch
M chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc View 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/invalidation/fake_invalidation_service.h View 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/invalidation/gcm_invalidation_bridge.h View 1 2 3 4 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/invalidation/invalidation_service_android.h View 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/invalidation/invalidation_service_android_unittest.cc View 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/invalidation/invalidation_service_test_template.h View 2 chunks +1 line, -1 line 0 comments Download
M chrome/browser/invalidation/ticl_invalidation_service.h View 1 2 3 4 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/invalidation/ticl_invalidation_service.cc View 1 2 3 4 5 6 7 1 chunk +2 lines, -3 lines 0 comments Download
M chrome/browser/invalidation/ticl_invalidation_service_unittest.cc View 1 2 3 4 5 6 7 8 1 chunk +2 lines, -2 lines 0 comments Download
M chrome/browser/invalidation/ticl_profile_settings_provider_unittest.cc View 1 2 3 4 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/sync/glue/sync_backend_host_impl_unittest.cc View 1 2 3 4 5 6 7 2 chunks +1 line, -1 line 0 comments Download
M chrome/browser/sync/test/integration/fake_server_invalidation_service.h View 1 2 3 4 5 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/sync/test/integration/sync_test.cc View 1 2 3 4 5 2 chunks +1 line, -1 line 0 comments Download
M chrome/chrome_tests_unit.gypi View 1 2 3 4 5 6 7 8 1 chunk +1 line, -0 lines 0 comments Download
M components/components_tests.gyp View 1 2 3 4 5 6 7 8 2 chunks +14 lines, -0 lines 0 comments Download
M components/invalidation.gypi View 1 2 3 4 chunks +47 lines, -3 lines 0 comments Download
M components/invalidation/DEPS View 1 chunk +11 lines, -0 lines 0 comments Download
A + components/invalidation/fake_invalidation_handler.h View 2 chunks +3 lines, -3 lines 0 comments Download
A + components/invalidation/fake_invalidation_handler.cc View 1 chunk +1 line, -1 line 0 comments Download
A + components/invalidation/fake_invalidation_state_tracker.h View 2 chunks +3 lines, -3 lines 0 comments Download
A + components/invalidation/fake_invalidation_state_tracker.cc View 1 chunk +1 line, -1 line 0 comments Download
A + components/invalidation/fake_invalidator.h View 2 chunks +4 lines, -4 lines 0 comments Download
A + components/invalidation/fake_invalidator.cc View 1 chunk +1 line, -1 line 0 comments Download
A + components/invalidation/fake_invalidator_unittest.cc View 1 chunk +2 lines, -2 lines 0 comments Download
A + components/invalidation/gcm_network_channel.h View 4 chunks +7 lines, -7 lines 0 comments Download
A + components/invalidation/gcm_network_channel.cc View 1 2 3 4 1 chunk +2 lines, -2 lines 0 comments Download
A + components/invalidation/gcm_network_channel_delegate.h View 2 chunks +3 lines, -3 lines 0 comments Download
A + components/invalidation/gcm_network_channel_unittest.cc View 1 chunk +1 line, -1 line 0 comments Download
A components/invalidation/invalidation_export.h View 1 chunk +21 lines, -0 lines 0 comments Download
M components/invalidation/invalidation_logger.h View 1 chunk +1 line, -1 line 0 comments Download
M components/invalidation/invalidation_logger_observer.h View 1 chunk +1 line, -1 line 0 comments Download
A + components/invalidation/invalidation_notifier.h View 4 chunks +7 lines, -7 lines 0 comments Download
A + components/invalidation/invalidation_notifier.cc View 1 chunk +1 line, -1 line 0 comments Download
A + components/invalidation/invalidation_notifier_unittest.cc View 1 chunk +5 lines, -5 lines 0 comments Download
M components/invalidation/invalidation_service.h View 1 chunk +1 line, -1 line 0 comments Download
A + components/invalidation/invalidator_registrar.h View 3 chunks +5 lines, -5 lines 0 comments Download
A + components/invalidation/invalidator_registrar.cc View 1 chunk +1 line, -1 line 0 comments Download
A + components/invalidation/invalidator_registrar_unittest.cc View 1 chunk +3 lines, -3 lines 0 comments Download
A + components/invalidation/invalidator_test_template.h View 2 chunks +5 lines, -5 lines 0 comments Download
A + components/invalidation/invalidator_test_template.cc View 1 chunk +1 line, -1 line 0 comments Download
A + components/invalidation/non_blocking_invalidator.h View 4 chunks +7 lines, -7 lines 0 comments Download
A + components/invalidation/non_blocking_invalidator.cc View 2 chunks +4 lines, -4 lines 0 comments Download
A + components/invalidation/non_blocking_invalidator_unittest.cc View 2 chunks +3 lines, -3 lines 0 comments Download
A components/invalidation/notifier_reason_util.h View 1 chunk +22 lines, -0 lines 0 comments Download
A + components/invalidation/notifier_reason_util.cc View 1 chunk +2 lines, -16 lines 0 comments Download
M components/invalidation/p2p_invalidation_service.h View 1 chunk +1 line, -1 line 0 comments Download
M components/invalidation/p2p_invalidation_service.cc View 1 chunk +1 line, -1 line 0 comments Download
A + components/invalidation/p2p_invalidator.h View 6 chunks +12 lines, -12 lines 0 comments Download
A + components/invalidation/p2p_invalidator.cc View 2 chunks +2 lines, -1 line 0 comments Download
A + components/invalidation/p2p_invalidator_unittest.cc View 1 chunk +5 lines, -3 lines 0 comments Download
A + components/invalidation/push_client_channel.h View 3 chunks +6 lines, -6 lines 0 comments Download
A + components/invalidation/push_client_channel.cc View 1 chunk +2 lines, -1 line 0 comments Download
A + components/invalidation/push_client_channel_unittest.cc View 1 chunk +1 line, -1 line 0 comments Download
A + components/invalidation/state_writer.h View 2 chunks +5 lines, -5 lines 0 comments Download
A + components/invalidation/sync_invalidation_listener.h View 5 chunks +9 lines, -9 lines 0 comments Download
A + components/invalidation/sync_invalidation_listener.cc View 1 chunk +1 line, -1 line 0 comments Download
A + components/invalidation/sync_invalidation_listener_unittest.cc View 1 chunk +3 lines, -3 lines 0 comments Download
A + components/invalidation/sync_system_resources.h View 5 chunks +8 lines, -8 lines 0 comments Download
A + components/invalidation/sync_system_resources.cc View 2 chunks +4 lines, -4 lines 0 comments Download
A + components/invalidation/sync_system_resources_unittest.cc View 2 chunks +3 lines, -3 lines 0 comments Download
A + sync/internal_api/public/base/invalidator_state.h View 2 chunks +3 lines, -11 lines 0 comments Download
A sync/internal_api/public/base/invalidator_state.cc View 1 chunk +25 lines, -0 lines 0 comments Download
M sync/internal_api/public/test/fake_sync_manager.h View 1 2 3 4 5 6 7 2 chunks +0 lines, -4 lines 0 comments Download
M sync/internal_api/sync_manager_impl.h View 1 2 3 4 5 6 7 1 chunk +1 line, -1 line 0 comments Download
M sync/internal_api/sync_manager_impl_unittest.cc View 1 chunk +0 lines, -1 line 0 comments Download
M sync/internal_api/test/fake_sync_manager.cc View 1 2 3 4 5 6 7 1 chunk +1 line, -1 line 0 comments Download
M sync/notifier/DEPS View 1 chunk +0 lines, -13 lines 0 comments Download
D sync/notifier/fake_invalidation_handler.h View 1 chunk +0 lines, -42 lines 0 comments Download
D sync/notifier/fake_invalidation_handler.cc View 1 chunk +0 lines, -40 lines 0 comments Download
D sync/notifier/fake_invalidation_state_tracker.h View 1 chunk +0 lines, -42 lines 0 comments Download
D sync/notifier/fake_invalidation_state_tracker.cc View 1 chunk +0 lines, -55 lines 0 comments Download
D sync/notifier/fake_invalidator.h View 1 chunk +0 lines, -53 lines 0 comments Download
D sync/notifier/fake_invalidator.cc View 1 chunk +0 lines, -69 lines 0 comments Download
D sync/notifier/fake_invalidator_unittest.cc View 1 chunk +0 lines, -63 lines 0 comments Download
D sync/notifier/gcm_network_channel.h View 1 chunk +0 lines, -135 lines 0 comments Download
D sync/notifier/gcm_network_channel.cc View 1 2 3 4 1 chunk +0 lines, -430 lines 0 comments Download
D sync/notifier/gcm_network_channel_delegate.h View 1 chunk +0 lines, -51 lines 0 comments Download
D sync/notifier/gcm_network_channel_unittest.cc View 1 chunk +0 lines, -494 lines 0 comments Download
M sync/notifier/invalidation_handler.h View 1 chunk +1 line, -1 line 0 comments Download
D sync/notifier/invalidation_notifier.h View 1 chunk +0 lines, -108 lines 0 comments Download
D sync/notifier/invalidation_notifier.cc View 1 chunk +0 lines, -93 lines 0 comments Download
D sync/notifier/invalidation_notifier_unittest.cc View 1 chunk +0 lines, -92 lines 0 comments Download
M sync/notifier/invalidation_state_tracker.h View 1 2 3 4 5 1 chunk +2 lines, -2 lines 0 comments Download
A + sync/notifier/invalidation_state_tracker.cc View 1 2 3 4 5 6 1 chunk +3 lines, -3 lines 0 comments Download
M sync/notifier/invalidator.h View 1 chunk +1 line, -1 line 0 comments Download
D sync/notifier/invalidator_registrar.h View 1 chunk +0 lines, -97 lines 0 comments Download
D sync/notifier/invalidator_registrar.cc View 1 chunk +0 lines, -149 lines 0 comments Download
D sync/notifier/invalidator_registrar_unittest.cc View 1 chunk +0 lines, -163 lines 0 comments Download
D sync/notifier/invalidator_state.h View 1 chunk +0 lines, -38 lines 0 comments Download
D sync/notifier/invalidator_state.cc View 1 chunk +0 lines, -55 lines 0 comments Download
D sync/notifier/invalidator_test_template.h View 1 chunk +0 lines, -377 lines 0 comments Download
D sync/notifier/invalidator_test_template.cc View 1 chunk +0 lines, -28 lines 0 comments Download
D sync/notifier/non_blocking_invalidator.h View 1 chunk +0 lines, -114 lines 0 comments Download
D sync/notifier/non_blocking_invalidator.cc View 1 chunk +0 lines, -367 lines 0 comments Download
D sync/notifier/non_blocking_invalidator_unittest.cc View 1 chunk +0 lines, -98 lines 0 comments Download
D sync/notifier/p2p_invalidator.h View 1 chunk +0 lines, -150 lines 0 comments Download
D sync/notifier/p2p_invalidator.cc View 1 chunk +0 lines, -299 lines 0 comments Download
D sync/notifier/p2p_invalidator_unittest.cc View 1 chunk +0 lines, -355 lines 0 comments Download
D sync/notifier/push_client_channel.h View 1 chunk +0 lines, -91 lines 0 comments Download
D sync/notifier/push_client_channel.cc View 1 chunk +0 lines, -161 lines 0 comments Download
D sync/notifier/push_client_channel_unittest.cc View 1 chunk +0 lines, -252 lines 0 comments Download
D sync/notifier/state_writer.h View 1 chunk +0 lines, -25 lines 0 comments Download
D sync/notifier/sync_invalidation_listener.h View 1 chunk +0 lines, -196 lines 0 comments Download
D sync/notifier/sync_invalidation_listener.cc View 1 chunk +0 lines, -443 lines 0 comments Download
D sync/notifier/sync_invalidation_listener_unittest.cc View 1 chunk +0 lines, -1129 lines 0 comments Download
D sync/notifier/sync_system_resources.h View 1 chunk +0 lines, -241 lines 0 comments Download
D sync/notifier/sync_system_resources.cc View 1 chunk +0 lines, -333 lines 0 comments Download
D sync/notifier/sync_system_resources_unittest.cc View 1 chunk +0 lines, -249 lines 0 comments Download
M sync/notifier/unacked_invalidation_set.cc View 1 chunk +0 lines, -1 line 0 comments Download
M sync/sync_internal_api.gypi View 1 2 3 4 5 6 1 chunk +2 lines, -0 lines 0 comments Download
M sync/sync_notifier.gypi View 1 2 3 4 5 2 chunks +1 line, -20 lines 0 comments Download
M sync/sync_tests.gypi View 1 2 3 4 5 6 7 8 2 chunks +0 lines, -17 lines 0 comments Download
M sync/tools/DEPS View 1 chunk +1 line, -0 lines 0 comments Download
M sync/tools/sync_client.cc View 2 chunks +1 line, -1 line 0 comments Download
M sync/tools/sync_listen_notifications.cc View 2 chunks +1 line, -1 line 0 comments Download
M sync/tools/sync_tools.gyp View 1 2 3 4 5 6 7 2 chunks +2 lines, -0 lines 0 comments Download

Messages

Total messages: 24 (0 generated)
rlarocque
Here's the first part of moving sync/notifier to components/invalidation. I started by moving sync_system_resources, then ...
6 years, 7 months ago (2014-05-21 20:24:49 UTC) #1
pavely
lgtm
6 years, 7 months ago (2014-05-22 19:50:45 UTC) #2
rlarocque
Turns out I need owners for new DEPS additions. These are really just DEPS moves, ...
6 years, 7 months ago (2014-05-22 20:03:26 UTC) #3
rlarocque
The CQ bit was checked by rlarocque@chromium.org
6 years, 7 months ago (2014-05-22 20:05:23 UTC) #4
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/rlarocque@chromium.org/294123004/70114
6 years, 7 months ago (2014-05-22 20:09:01 UTC) #5
ramant (doing other things)
components/invalidation/DEPS changes LGTM
6 years, 7 months ago (2014-05-22 20:51:57 UTC) #6
commit-bot: I haz the power
FYI, CQ is re-trying this CL (attempt #1). Please consider checking whether the failures are ...
6 years, 7 months ago (2014-05-22 23:54:25 UTC) #7
commit-bot: I haz the power
The CQ bit was unchecked by commit-bot@chromium.org
6 years, 7 months ago (2014-05-23 00:04:01 UTC) #8
commit-bot: I haz the power
Try jobs failed on following builders: mac_gpu on tryserver.chromium.gpu (http://build.chromium.org/p/tryserver.chromium.gpu/builders/mac_gpu/builds/8384)
6 years, 7 months ago (2014-05-23 00:04:02 UTC) #9
rlarocque
Unfortunately, one of those failures is legit and hard to fix. The sync standalone test ...
6 years, 6 months ago (2014-05-27 22:10:23 UTC) #10
rlarocque
On 2014/05/27 22:10:23, rlarocque wrote: > Unfortunately, one of those failures is legit and hard ...
6 years, 6 months ago (2014-05-30 17:46:39 UTC) #11
maniscalco
On 2014/05/30 17:46:39, rlarocque wrote: > On 2014/05/27 22:10:23, rlarocque wrote: > > Unfortunately, one ...
6 years, 6 months ago (2014-05-30 17:55:25 UTC) #12
rlarocque
The CQ bit was checked by rlarocque@chromium.org
6 years, 6 months ago (2014-05-30 18:49:13 UTC) #13
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/rlarocque@chromium.org/294123004/130001
6 years, 6 months ago (2014-05-30 18:51:10 UTC) #14
commit-bot: I haz the power
FYI, CQ is re-trying this CL (attempt #1). The failing builders are: android_clang_dbg on tryserver.chromium ...
6 years, 6 months ago (2014-05-31 00:48:57 UTC) #15
commit-bot: I haz the power
The CQ bit was unchecked by commit-bot@chromium.org
6 years, 6 months ago (2014-05-31 02:22:48 UTC) #16
commit-bot: I haz the power
Try jobs failed on following builders: android_dbg_triggered_tests on tryserver.chromium (http://build.chromium.org/p/tryserver.chromium/builders/android_dbg_triggered_tests/builds/158463)
6 years, 6 months ago (2014-05-31 02:22:49 UTC) #17
rlarocque
The CQ bit was checked by rlarocque@chromium.org
6 years, 6 months ago (2014-06-02 17:48:34 UTC) #18
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/rlarocque@chromium.org/294123004/130001
6 years, 6 months ago (2014-06-02 17:49:42 UTC) #19
rlarocque
The CQ bit was unchecked by rlarocque@chromium.org
6 years, 6 months ago (2014-06-02 17:50:04 UTC) #20
rlarocque
The CQ bit was checked by rlarocque@chromium.org
6 years, 6 months ago (2014-06-02 18:11:17 UTC) #21
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/rlarocque@chromium.org/294123004/150001
6 years, 6 months ago (2014-06-02 18:12:14 UTC) #22
commit-bot: I haz the power
Change committed as 274350
6 years, 6 months ago (2014-06-02 22:17:53 UTC) #23
rlarocque
6 years, 6 months ago (2014-06-02 23:13:36 UTC) #24
Message was sent while issue was closed.
A revert of this CL has been created in
https://codereview.chromium.org/308413002/ by rlarocque@chromium.org.

The reason for reverting is: Passed the CQ but broke the buildbot..

Powered by Google App Engine
This is Rietveld 408576698