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

sync/test/engine/test_syncable_utils.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.
 
 // Utilities to verify the state of items in unit tests.
 
 #include "sync/test/engine/test_syncable_utils.h"
 
-#include "sync/syncable/base_transaction.h"
 #include "sync/syncable/directory.h"
 #include "sync/syncable/entry.h"
 #include "sync/syncable/mutable_entry.h"
-#include "sync/syncable/write_transaction.h"
+#include "sync/syncable/syncable_base_transaction.h"
+#include "sync/syncable/syncable_write_transaction.h"
 #include "sync/test/engine/test_id_factory.h"
 
 using std::string;
 
 namespace syncer {
 namespace syncable {
 
 int CountEntriesWithName(BaseTransaction* rtrans,
                          const syncable::Id& parent_id,
                          const string& name) {
@@ skipping 60 matching lines @@
   node.Put(syncable::IS_DEL, false);
   node.Put(syncable::ID, syncer::TestIdFactory::MakeServer(tag_name));
   sync_pb::EntitySpecifics specifics;
   syncer::AddDefaultFieldValue(type, &specifics);
   node.Put(syncable::SERVER_SPECIFICS, specifics);
   node.Put(syncable::SPECIFICS, specifics);
 }
 
 }  // namespace syncable
 }  // namespace syncer