[Sync] Move //components/sync to the syncer namespace.

components/sync/engine_impl/conflict_resolver.cc

 // 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 "components/sync/engine_impl/conflict_resolver.h"
 
 #include <list>
 #include <set>
 #include <string>
 
 #include "base/metrics/histogram_macros.h"
 #include "components/sync/base/cryptographer.h"
 #include "components/sync/engine/cycle/update_counters.h"
 #include "components/sync/engine_impl/conflict_util.h"
 #include "components/sync/engine_impl/cycle/status_controller.h"
 #include "components/sync/engine_impl/syncer_util.h"
 #include "components/sync/syncable/directory.h"
 #include "components/sync/syncable/mutable_entry.h"
 #include "components/sync/syncable/syncable_write_transaction.h"
 
 using std::list;
 using std::set;
 
 namespace syncer {
 
-using syncable::Directory;
-using syncable::Entry;
-using syncable::Id;
-using syncable::MutableEntry;
-using syncable::WriteTransaction;
+using syncer::syncable::Directory;
+using syncer::syncable::Entry;
+using syncer::syncable::Id;
+using syncer::syncable::MutableEntry;
+using syncer::syncable::WriteTransaction;
 
 namespace {
 
 // Returns true iff the set of attachment ids contained in attachment_metadata
 // matches the set of ids contained in server_attachment_metadata.
 bool AttachmentMetadataMatches(const MutableEntry& entity) {
   const sync_pb::AttachmentMetadata& local = entity.GetAttachmentMetadata();
   const sync_pb::AttachmentMetadata& server =
       entity.GetServerAttachmentMetadata();
   if (local.record_size() != server.record_size()) {
@@ skipping 236 matching lines @@
             GetModelTypeFromSpecifics(conflicting_node.GetSpecifics()))) {
       continue;
     }
 
     ProcessSimpleConflict(trans, *it, cryptographer, status, counters);
   }
   return;
 }
 
 }  // namespace syncer