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

sync/syncable/entry.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/syncable/entry.h"
 
 #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;
 
 namespace syncer {
 namespace syncable {
 
 Entry::Entry(BaseTransaction* trans, GetById, const Id& id)
     : basetrans_(trans) {
   kernel_ = trans->directory()->GetEntryById(id);
@@ skipping 119 matching lines @@
   os << "TempFlags: ";
   for ( ; i < BIT_TEMPS_END; ++i) {
     if (kernel->ref(static_cast<BitTemp>(i)))
       os << "#" << i - BIT_TEMPS_BEGIN << ", ";
   }
   return os;
 }
 
 }  // namespace syncable
 }  // namespace syncer