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

sync/test/engine/test_directory_setter_upper.cc

Index: sync/test/engine/test_directory_setter_upper.cc
diff --git a/sync/test/engine/test_directory_setter_upper.cc b/sync/test/engine/test_directory_setter_upper.cc
index e30229954543e8d5e3d6b6683c37eba380bba70f..ee0e24053f106f206a659572360c1fbdcfc949e0 100644
--- a/sync/test/engine/test_directory_setter_upper.cc
+++ b/sync/test/engine/test_directory_setter_upper.cc
@@ -1,4 +1,4 @@
-// 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.
 
@@ -11,8 +11,8 @@
 #include "sync/syncable/directory.h"
 #include "sync/syncable/in_memory_directory_backing_store.h"
 #include "sync/syncable/mutable_entry.h"
-#include "sync/syncable/read_transaction.h"
-#include "sync/syncable/write_transaction.h"
+#include "sync/syncable/syncable_read_transaction.h"
+#include "sync/syncable/syncable_write_transaction.h"
 #include "sync/test/test_transaction_observer.h"
 #include "testing/gtest/include/gtest/gtest.h"