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

sync/syncable/syncable_util.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/syncable_util.h"
 
 #include "base/location.h"
 #include "base/logging.h"
 #include "sync/syncable/directory.h"
 #include "sync/syncable/entry.h"
 #include "sync/syncable/mutable_entry.h"
 #include "sync/syncable/syncable_id.h"
-#include "sync/syncable/write_transaction.h"
+#include "sync/syncable/syncable_write_transaction.h"
 
 namespace syncer {
 namespace syncable {
 
 // Returns the number of unsynced entries.
 int GetUnsyncedEntries(BaseTransaction* trans,
                        std::vector<int64> *handles) {
   trans->directory()->GetUnsyncedMetaHandles(trans, handles);
   DVLOG_IF(1, !handles->empty()) << "Have " << handles->size()
                                  << " unsynced items.";
@@ skipping 73 matching lines @@
                 BaseTransaction* trans) {
   if (!condition) {
     trans->OnUnrecoverableError(location, msg);
     return false;
   }
   return true;
 }
 
 }  // namespace syncable
 }  // namespace syncer