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

sync/engine/apply_updates_and_resolve_conflicts_command.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/apply_updates_and_resolve_conflicts_command.h"
 
 #include "base/location.h"
 #include "sync/engine/conflict_resolver.h"
 #include "sync/engine/update_applicator.h"
 #include "sync/sessions/sync_session.h"
 #include "sync/syncable/directory.h"
-#include "sync/syncable/read_transaction.h"
-#include "sync/syncable/write_transaction.h"
+#include "sync/syncable/syncable_read_transaction.h"
+#include "sync/syncable/syncable_write_transaction.h"
 
 namespace syncer {
 
 using sessions::SyncSession;
 
 ApplyUpdatesAndResolveConflictsCommand::
     ApplyUpdatesAndResolveConflictsCommand() {}
 ApplyUpdatesAndResolveConflictsCommand::
     ~ApplyUpdatesAndResolveConflictsCommand() {}
 
@@ skipping 101 matching lines @@
     // resolver should have resolved all the conflicts we detected last time
     // and, by the two previous assertions, that no conflicts have been
     // downgraded from encryption or hierarchy down to simple.
     DCHECK(conflict_applicator.simple_conflict_ids().empty());
   }
 
   return SYNCER_OK;
 }
 
 }  // namespace syncer