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

sync/internal_api/public/base/model_type.h

Index: sync/internal_api/public/base/model_type.h
diff --git a/sync/internal_api/public/base/model_type.h b/sync/internal_api/public/base/model_type.h
index 77c234417544fbd558a2cd3c8156597fff3c059d..c8b1948e03953220c248e9b1c98da0c30a29d9e6 100644
--- a/sync/internal_api/public/base/model_type.h
+++ b/sync/internal_api/public/base/model_type.h
@@ -30,8 +30,6 @@ class SyncEntity;
 
 namespace syncer {
 
-namespace syncable {
-
 enum ModelType {
   // Object type unknown.  Objects may transition through
   // the unknown state during their initial creation, before
@@ -103,7 +101,7 @@ inline ModelType ModelTypeFromInt(int i) {
   return static_cast<ModelType>(i);
 }
 
-void AddDefaultFieldValue(syncable::ModelType datatype,
+void AddDefaultFieldValue(ModelType datatype,
                           sync_pb::EntitySpecifics* specifics);
 
 // Extract the model type of a SyncEntity protocol buffer.  ModelType is a
@@ -172,56 +170,6 @@ bool NotificationTypeToRealModelType(const std::string& notification_type,
 // Returns true if |model_type| is a real datatype
 bool IsRealDataType(ModelType model_type);
 
-}  // 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::ModelType;
-using syncer::syncable::ModelTypeSet;
-using syncer::syncable::FullModelTypeSet;
-using syncer::syncable::UNSPECIFIED;
-using syncer::syncable::TOP_LEVEL_FOLDER;
-using syncer::syncable::BOOKMARKS;
-using syncer::syncable::FIRST_REAL_MODEL_TYPE;
-using syncer::syncable::PREFERENCES;
-using syncer::syncable::PASSWORDS;
-using syncer::syncable::AUTOFILL_PROFILE;
-using syncer::syncable::AUTOFILL;
-using syncer::syncable::THEMES;
-using syncer::syncable::TYPED_URLS;
-using syncer::syncable::EXTENSIONS;
-using syncer::syncable::NIGORI;
-using syncer::syncable::SEARCH_ENGINES;
-using syncer::syncable::SESSIONS;
-using syncer::syncable::APPS;
-using syncer::syncable::APP_SETTINGS;
-using syncer::syncable::EXTENSION_SETTINGS;
-using syncer::syncable::APP_NOTIFICATIONS;
-using syncer::syncable::LAST_REAL_MODEL_TYPE;
-using syncer::syncable::MODEL_TYPE_COUNT;
-using syncer::syncable::ModelTypeFromInt;
-using syncer::syncable::AddDefaultFieldValue;
-using syncer::syncable::GetModelType;
-using syncer::syncable::GetModelTypeFromSpecifics;
-using syncer::syncable::ShouldMaintainPosition;
-using syncer::syncable::GetModelTypeFromSpecificsFieldNumber;
-using syncer::syncable::GetSpecificsFieldNumberFromModelType;
-using syncer::syncable::ModelTypeToString;
-using syncer::syncable::ModelTypeToValue;
-using syncer::syncable::ModelTypeFromValue;
-using syncer::syncable::ModelTypeFromString;
-using syncer::syncable::ModelTypeSetToString;
-using syncer::syncable::ModelTypeSetToValue;
-using syncer::syncable::ModelTypeSetFromValue;
-using syncer::syncable::ModelTypeToRootTag;
-using syncer::syncable::RealModelTypeToNotificationType;
-using syncer::syncable::NotificationTypeToRealModelType;
-using syncer::syncable::IsRealDataType;
-
-}  // namespace syncable
-
 #endif  // SYNC_INTERNAL_API_PUBLIC_BASE_MODEL_TYPE_H_