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

sync/engine/conflict_resolver.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/conflict_resolver.h"
 
 #include <list>
 #include <set>
 #include <string>
 
 #include "base/metrics/histogram.h"
 #include "sync/engine/conflict_util.h"
 #include "sync/engine/syncer_util.h"
 #include "sync/sessions/status_controller.h"
 #include "sync/syncable/directory.h"
 #include "sync/syncable/mutable_entry.h"
-#include "sync/syncable/write_transaction.h"
+#include "sync/syncable/syncable_write_transaction.h"
 #include "sync/util/cryptographer.h"
 
 using std::list;
 using std::set;
 
 namespace syncer {
 
 using sessions::StatusController;
 using syncable::Directory;
 using syncable::Entry;
@@ skipping 270 matching lines @@
       id = predecessors.back();
       predecessors.pop_back();
       ProcessSimpleConflict(trans, id, cryptographer, status);
       processed_items.insert(id);
     }
   }
   return;
 }
 
 }  // namespace syncer