[Sync] Move ModelType and related classes to 'syncer' namespace

sync/internal_api/public/base/model_type_payload_map.h

Index: sync/internal_api/public/base/model_type_payload_map.h
diff --git a/sync/internal_api/public/base/model_type_payload_map.h b/sync/internal_api/public/base/model_type_payload_map.h
index b95e15270cd3dacb7669b233c62e2e32ff18ee9b..da708f7c4ec5ab6fc1aad4117d188a2b0207bdd3 100644
--- a/sync/internal_api/public/base/model_type_payload_map.h
+++ b/sync/internal_api/public/base/model_type_payload_map.h
@@ -18,7 +18,6 @@ class DictionaryValue;
 }
 
 namespace syncer {
-namespace syncable {
 
 // A container that contains a set of datatypes with possible string
 // payloads.
@@ -46,20 +45,6 @@ base::DictionaryValue* ModelTypePayloadMapToValue(
 void CoalescePayloads(ModelTypePayloadMap* original,
                       const ModelTypePayloadMap& update);
 
-}  // namespace syncable
 }  // namespace syncer
 
-// TODO(akalin): Move the names below to the 'syncer' namespace once
-// we move this file to public/base.
-namespace syncable {
-
-using ::syncer::syncable::ModelTypePayloadMap;
-using ::syncer::syncable::ModelTypePayloadMapFromEnumSet;
-using ::syncer::syncable::ModelTypePayloadMapToEnumSet;
-using ::syncer::syncable::ModelTypePayloadMapToString;
-using ::syncer::syncable::ModelTypePayloadMapToValue;
-using ::syncer::syncable::CoalescePayloads;
-
-}  // namespace syncable
-
 #endif  // SYNC_INTERNAL_PUBLIC_API_BASE_MODEL_TYPE_PAYLOAD_MAP_H_