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

sync/sync.gyp

Index: sync/sync.gyp
diff --git a/sync/sync.gyp b/sync/sync.gyp
index 475f86b713334d27227eb459385a3c54c5e73f44..43a0b0a4f069270a1a4112c1baa5d3e6925f833b 100644
--- a/sync/sync.gyp
+++ b/sync/sync.gyp
@@ -126,8 +126,6 @@
         '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',
@@ -153,10 +151,14 @@
         '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',
@@ -165,11 +167,21 @@
         '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',