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

sync/syncable/entry.cc

Index: sync/syncable/entry.cc
diff --git a/sync/syncable/entry.cc b/sync/syncable/entry.cc
index a0c8a4a84a1687c5713f7b26700063e37e21cad6..07ec19afb0f571e4377630864ea767f960beddd7 100644
--- a/sync/syncable/entry.cc
+++ b/sync/syncable/entry.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.
 
@@ -7,9 +7,9 @@
 #include <iomanip>
 
 #include "base/json/string_escape.h"
-#include "sync/syncable/base_transaction.h"
 #include "sync/syncable/blob.h"
 #include "sync/syncable/directory.h"
+#include "sync/syncable/syncable_base_transaction.h"
 #include "sync/syncable/syncable_columns.h"
 
 using std::string;