c9ce60ba84839bb415222019f97c2499c64eb3f4 - chromium/src

commit	c9ce60ba84839bb415222019f97c2499c64eb3f4	[log] [tgz]
author	[email protected] <[email protected]@0039d316-1c4b-4281-b951-d872f2087c98>	Wed Dec 19 23:16:08 2012
committer	[email protected] <[email protected]@0039d316-1c4b-4281-b951-d872f2087c98>	Wed Dec 19 23:16:08 2012
tree	2951b4af13346acfb545a6ccc3a621c1560a863a
parent	05aee8931fc1b9a1cf73003cba7f05673bb4959d [diff]

[sync] Componentize sync: Part 5: Eliminate filename collisions in sync.gyp

In order to move src/sync into its own compoent, all the static_library targets in sync.gyp need to be converted to targets of type 'none' and rolled into one sync target of type component. This is currently blocked by duplicate .cc filenames in syncable and internal_api, which flags an error while running gyp. The offending files are {internal_api|syncable}/{base|read|write}_transaction.cc.

This patch renames syncable/{base|read|write}_transaction.{h|cc} to syncable/syncable_{base|read|write}_transaction.{h|cc}.

BUG=136928

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

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

chrome/browser/sync/glue/bookmark_change_processor.cc[diff]
chrome/browser/sync/glue/bookmark_model_associator.cc[diff]
chrome/browser/sync/glue/session_model_associator.cc[diff]
chrome/browser/sync/profile_sync_service_autofill_unittest.cc[diff]
sync/engine/apply_control_data_updates.cc[diff]
sync/engine/apply_control_data_updates_unittest.cc[diff]
sync/engine/apply_updates_and_resolve_conflicts_command.cc[diff]
sync/engine/apply_updates_and_resolve_conflicts_command_unittest.cc[diff]
sync/engine/build_commit_command.cc[diff]
sync/engine/commit.cc[diff]
sync/engine/conflict_resolver.cc[diff]
sync/engine/download_updates_command.cc[diff]
sync/engine/get_commit_ids_command.cc[diff]
sync/engine/process_commit_response_command.cc[diff]
sync/engine/process_commit_response_command_unittest.cc[diff]
sync/engine/process_updates_command.cc[diff]
sync/engine/syncer_unittest.cc[diff]
sync/engine/syncer_util.cc[diff]
sync/engine/update_applicator.cc[diff]
sync/internal_api/change_reorder_buffer.cc[diff]
sync/internal_api/read_node.cc[diff]
sync/internal_api/read_transaction.cc[diff]
sync/internal_api/sync_encryption_handler_impl.cc[diff]
sync/internal_api/sync_encryption_handler_impl_unittest.cc[diff]
sync/internal_api/sync_manager_impl_unittest.cc[diff]
sync/internal_api/test/test_entry_factory.cc[diff]
sync/internal_api/test/test_user_share.cc[diff]
sync/internal_api/write_transaction.cc[diff]
sync/sessions/sync_session_unittest.cc[diff]
sync/sync.gyp[diff]
sync/syncable/directory.cc[diff]
sync/syncable/entry.cc[diff]
sync/syncable/mutable_entry.cc[diff]
sync/syncable/nigori_util.cc[diff]
sync/syncable/syncable_base_transaction.cc[Renamed from sync/syncable/base_transaction.cc - diff]
sync/syncable/syncable_base_transaction.h[Renamed from sync/syncable/base_transaction.h - diff]
sync/syncable/syncable_mock.h[diff]
sync/syncable/syncable_read_transaction.cc[Renamed from sync/syncable/read_transaction.cc - diff]
sync/syncable/syncable_read_transaction.h[Renamed from sync/syncable/read_transaction.h - diff]
sync/syncable/syncable_unittest.cc[diff]
sync/syncable/syncable_util.cc[diff]
sync/syncable/syncable_write_transaction.cc[Renamed from sync/syncable/write_transaction.cc - diff]
sync/syncable/syncable_write_transaction.h[Renamed from sync/syncable/write_transaction.h - diff]
sync/syncable/write_transaction_info.h[diff]
sync/test/engine/mock_connection_manager.cc[diff]
sync/test/engine/test_directory_setter_upper.cc[diff]
sync/test/engine/test_syncable_utils.cc[diff]

47 files changed