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

sync/engine/commit.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/engine/commit.h"
 
 #include "base/debug/trace_event.h"
 #include "sync/engine/build_commit_command.h"
 #include "sync/engine/get_commit_ids_command.h"
 #include "sync/engine/process_commit_response_command.h"
 #include "sync/engine/syncer_proto_util.h"
 #include "sync/sessions/sync_session.h"
 #include "sync/syncable/mutable_entry.h"
-#include "sync/syncable/write_transaction.h"
+#include "sync/syncable/syncable_write_transaction.h"
 
 namespace syncer {
 
 using sessions::SyncSession;
 using sessions::StatusController;
 using syncable::SYNCER;
 using syncable::WriteTransaction;
 
 namespace {
 
@@ skipping 121 matching lines @@
                                 sessions::SyncSession* session) {
   sessions::OrderedCommitSet commit_set(session->routing_info());
   SyncerError result = BuildAndPostCommitsImpl(syncer, session, &commit_set);
   if (result != SYNCER_OK) {
     ClearSyncingBits(session->context()->directory(), commit_set);
   }
   return result;
 }
 
 }  // namespace syncer