Cleanup ExtensionSyncService and SyncBundle.
commit0c714f7ca6d4f027501aa8ef8ae91ebc99788b62
authortreib <treib@chromium.org>
Wed, 8 Jul 2015 10:04:58 +0000 (8 03:04 -0700)
committerCommit bot <commit-bot@chromium.org>
Wed, 8 Jul 2015 10:05:52 +0000 (8 10:05 +0000)
tree0a714647309b821a0521e948df80b8d6987bfd5a
parentdf8d7aec09f4a337a27a7b1bde1da5f22dc88c61
Cleanup ExtensionSyncService and SyncBundle.

- Merge AppSyncData into ExtensionSyncData.
- Remove duplication between AppSyncBundle and ExtensionSyncBundle by moving everything into the common SyncBundle.
- In SyncBundle, use consistent "push"/"apply" notation for changes going to/coming from Sync, rather than "process" for everything.
- Reduce the back-and-forth of ExtensionSyncService and SyncBundle calling into each other.

TBRing a straightforward change in two_client_apps_sync_test.cc
TBR=zea@chromium.org

BUG=None

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

Cr-Commit-Position: refs/heads/master@{#337793}
23 files changed:
chrome/browser/apps/ephemeral_app_browsertest.cc
chrome/browser/extensions/app_sync_bundle.cc [deleted file]
chrome/browser/extensions/app_sync_bundle.h [deleted file]
chrome/browser/extensions/app_sync_data.cc [deleted file]
chrome/browser/extensions/app_sync_data.h [deleted file]
chrome/browser/extensions/app_sync_data_unittest.cc [deleted file]
chrome/browser/extensions/extension_disabled_ui_browsertest.cc
chrome/browser/extensions/extension_service.cc
chrome/browser/extensions/extension_service_unittest.cc
chrome/browser/extensions/extension_sync_bundle.cc [deleted file]
chrome/browser/extensions/extension_sync_bundle.h [deleted file]
chrome/browser/extensions/extension_sync_data.cc
chrome/browser/extensions/extension_sync_data.h
chrome/browser/extensions/extension_sync_data_unittest.cc
chrome/browser/extensions/extension_sync_service.cc
chrome/browser/extensions/extension_sync_service.h
chrome/browser/extensions/pending_enables.cc
chrome/browser/extensions/pending_enables.h
chrome/browser/extensions/sync_bundle.cc [new file with mode: 0644]
chrome/browser/extensions/sync_bundle.h
chrome/browser/sync/test/integration/two_client_apps_sync_test.cc
chrome/chrome_browser_extensions.gypi
chrome/chrome_tests_unit.gypi