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

sync/sync.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     # The core sync library.
@@ skipping 108 matching lines @@
         'protocol/sync_protocol_error.h',
         'sessions/debug_info_getter.h',
         'sessions/ordered_commit_set.cc',
         'sessions/ordered_commit_set.h',
         'sessions/status_controller.cc',
         'sessions/status_controller.h',
         'sessions/sync_session.cc',
         'sessions/sync_session.h',
         'sessions/sync_session_context.cc',
         'sessions/sync_session_context.h',
-        'syncable/base_transaction.cc',
-        'syncable/base_transaction.h',
         'syncable/blob.h',
         'syncable/dir_open_result.h',
         'syncable/directory.cc',
         'syncable/directory.h',
         'syncable/directory_backing_store.cc',
         'syncable/directory_backing_store.h',
         'syncable/directory_change_delegate.h',
         'syncable/entry.cc',
         'syncable/entry.h',
         'syncable/entry_kernel.cc',
         'syncable/entry_kernel.h',
         'syncable/in_memory_directory_backing_store.cc',
         'syncable/in_memory_directory_backing_store.h',
         'syncable/invalid_directory_backing_store.cc',
         'syncable/invalid_directory_backing_store.h',
         'syncable/metahandle_set.h',
         'syncable/model_type.cc',
         'syncable/mutable_entry.cc',
         'syncable/mutable_entry.h',
         'syncable/nigori_handler.cc',
         'syncable/nigori_handler.h',
         'syncable/nigori_util.cc',
         'syncable/nigori_util.h',
         'syncable/on_disk_directory_backing_store.cc',
         'syncable/on_disk_directory_backing_store.h',
-        'syncable/read_transaction.cc',
-        'syncable/read_transaction.h',
         'syncable/scoped_kernel_lock.h',
         'syncable/syncable-inl.h',
+
+        # Renamed to not collide with identically named files in internal_api.
+        # TODO(sync): Figure out if this class is required.
+        'syncable/syncable_base_transaction.cc',
+        'syncable/syncable_base_transaction.h',
+
         'syncable/syncable_changes_version.h',
         'syncable/syncable_columns.h',
         'syncable/syncable_enum_conversions.cc',
         'syncable/syncable_enum_conversions.h',
         'syncable/syncable_id.cc',
         'syncable/syncable_id.h',
         'syncable/syncable_proto_util.cc',
         'syncable/syncable_proto_util.h',
+
+        # Renamed to not collide with identically named files in internal_api.
+        # TODO(sync): Figure out if this class is required.
+        'syncable/syncable_read_transaction.cc',
+        'syncable/syncable_read_transaction.h',
+
         'syncable/syncable_util.cc',
         'syncable/syncable_util.h',
+
+        # Renamed to not collide with identically named files in internal_api.
+        # TODO(sync): Figure out if this class is required.

[rlarocque, 2012/12/19 22:04:49]

I wouldn't bother with these TODOs.  It's not really clear from reading them
exactly what is to be done.  If anything, we could file a bug that talks about
what we could do with these classes.

[Raghu Simha, 2012/12/19 22:10:36]

I removed the rest of the comment too, since on second thoughts, it doesn't seem
necessary. Done.

+        'syncable/syncable_write_transaction.cc',
+        'syncable/syncable_write_transaction.h',
+
         'syncable/transaction_observer.h',
-        'syncable/write_transaction.cc',
-        'syncable/write_transaction.h',
         'syncable/write_transaction_info.cc',
         'syncable/write_transaction_info.h',
         'util/cryptographer.cc',
         'util/cryptographer.h',
 
         # TODO(akalin): Figure out a better place to put
         # data_encryption_win*; it's also used by autofill.
         'util/data_encryption_win.cc',
         'util/data_encryption_win.h',
 
@@ skipping 811 matching lines @@
           'variables': {
             'test_suite_name': 'sync_unit_tests',
             'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)sync_unit_tests<(SHARED_LIB_SUFFIX)',
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
       ],
     }],
   ],
 }