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

sync/engine/apply_control_data_updates.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_control_data_updates.h"
 
 #include "base/metrics/histogram.h"
 #include "sync/engine/conflict_resolver.h"
 #include "sync/engine/conflict_util.h"
 #include "sync/engine/syncer_util.h"
 #include "sync/syncable/directory.h"
 #include "sync/syncable/mutable_entry.h"
 #include "sync/syncable/nigori_handler.h"
 #include "sync/syncable/nigori_util.h"
-#include "sync/syncable/write_transaction.h"
+#include "sync/syncable/syncable_write_transaction.h"
 #include "sync/util/cryptographer.h"
 
 namespace syncer {
 
 using syncable::GET_BY_SERVER_TAG;
 using syncable::IS_UNAPPLIED_UPDATE;
 using syncable::IS_UNSYNCED;
 using syncable::SERVER_SPECIFICS;
 using syncable::SPECIFICS;
 using syncable::SYNCER;
@@ skipping 187 matching lines @@
                               ConflictResolver::OVERWRITE_LOCAL,
                               ConflictResolver::CONFLICT_RESOLUTION_SIZE);
   }
 
   UpdateAttemptResponse response = AttemptToUpdateEntry(
       trans, entry, cryptographer);
   DCHECK_EQ(SUCCESS, response);
 }
 
 }  // namespace syncer