[Sync] Move sync/{internal_api,syncable} into syncer namespace

sync/engine/conflict_resolver.cc

Index: sync/engine/conflict_resolver.cc
diff --git a/sync/engine/conflict_resolver.cc b/sync/engine/conflict_resolver.cc
index 54bcb60dc85de2fba9baf63a84705ce3e7756f39..c10b21c9286006010ace05c9377b75622b3a9fdd 100644
--- a/sync/engine/conflict_resolver.cc
+++ b/sync/engine/conflict_resolver.cc
@@ -23,6 +23,11 @@
 using std::list;
 using std::map;
 using std::set;
+
+namespace syncer {
+
+using sessions::ConflictProgress;
+using sessions::StatusController;
 using syncable::BaseTransaction;
 using syncable::Directory;
 using syncable::Entry;
@@ -32,11 +37,6 @@ using syncable::IsRealDataType;
 using syncable::MutableEntry;
 using syncable::WriteTransaction;
 
-namespace syncer {
-
-using sessions::ConflictProgress;
-using sessions::StatusController;
-
 namespace {
 
 const int SYNC_CYCLES_BEFORE_ADMITTING_DEFEAT = 8;