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

sync/internal_api/test/test_entry_factory.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 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.
 
 #include "sync/internal_api/public/test/test_entry_factory.h"
 
 #include "sync/syncable/directory.h"
 #include "sync/syncable/entry.h"
 #include "sync/syncable/mutable_entry.h"
-#include "sync/syncable/read_transaction.h"
 #include "sync/syncable/syncable_id.h"
-#include "sync/syncable/write_transaction.h"
+#include "sync/syncable/syncable_read_transaction.h"
+#include "sync/syncable/syncable_write_transaction.h"
 #include "sync/test/engine/test_id_factory.h"
 
 using std::string;
 
 namespace syncer {
 
 using syncable::Id;
 using syncable::MutableEntry;
 using syncable::UNITTEST;
 using syncable::WriteTransaction;
@@ skipping 223 matching lines @@
     return false;
   }
   return entry.Get(syncable::IS_UNAPPLIED_UPDATE);
 }
 
 int64 TestEntryFactory::GetNextRevision() {
   return next_revision_++;
 }
 
 }  // namespace syncer