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

sync/engine/update_applicator.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/update_applicator.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "sync/engine/syncer_util.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"
 
 using std::vector;
 
 namespace syncer {
 
 using syncable::ID;
 
 UpdateApplicator::UpdateApplicator(Cryptographer* cryptographer,
                                    const ModelSafeRoutingInfo& routes,
                                    ModelSafeGroup group_filter)
@@ skipping 91 matching lines @@
       !routing_info_.count(type) &&
       type != UNSPECIFIED &&
       type != TOP_LEVEL_FOLDER) {
     DVLOG(1) << "Skipping update application, type not permitted.";
     return true;
   }
   return false;
 }
 
 }  // namespace syncer