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

sync/syncable/model_type.cc

 // Copyright (c) 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/internal_api/public/base/model_type.h"
 
 #include "base/string_split.h"
 #include "base/values.h"
 #include "sync/engine/syncproto.h"
 #include "sync/protocol/app_notification_specifics.pb.h"
 #include "sync/protocol/app_setting_specifics.pb.h"
 #include "sync/protocol/app_specifics.pb.h"
 #include "sync/protocol/autofill_specifics.pb.h"
 #include "sync/protocol/bookmark_specifics.pb.h"
 #include "sync/protocol/extension_setting_specifics.pb.h"
 #include "sync/protocol/extension_specifics.pb.h"
 #include "sync/protocol/nigori_specifics.pb.h"
 #include "sync/protocol/password_specifics.pb.h"
 #include "sync/protocol/preference_specifics.pb.h"
 #include "sync/protocol/search_engine_specifics.pb.h"
 #include "sync/protocol/session_specifics.pb.h"
 #include "sync/protocol/sync.pb.h"
 #include "sync/protocol/theme_specifics.pb.h"
 #include "sync/protocol/typed_url_specifics.pb.h"
 
 namespace syncer {
-namespace syncable {
 
-void AddDefaultFieldValue(syncable::ModelType datatype,
-                              sync_pb::EntitySpecifics* specifics) {
+void AddDefaultFieldValue(ModelType datatype,
+                          sync_pb::EntitySpecifics* specifics) {
   switch (datatype) {
     case BOOKMARKS:
       specifics->mutable_bookmark();
       break;
     case PASSWORDS:
       specifics->mutable_password();
       break;
     case PREFERENCES:
       specifics->mutable_preference();
       break;
@@ skipping 228 matching lines @@
     case APP_NOTIFICATIONS:
       return "App Notifications";
     default:
       break;
   }
   NOTREACHED() << "No known extension for model type.";
   return "INVALID";
 }
 
 StringValue* ModelTypeToValue(ModelType model_type) {
-  if (model_type >= syncable::FIRST_REAL_MODEL_TYPE) {
+  if (model_type >= FIRST_REAL_MODEL_TYPE) {
     return Value::CreateStringValue(ModelTypeToString(model_type));
-  } else if (model_type == syncable::TOP_LEVEL_FOLDER) {
+  } else if (model_type == TOP_LEVEL_FOLDER) {
     return Value::CreateStringValue("Top-level folder");
-  } else if (model_type == syncable::UNSPECIFIED) {
+  } else if (model_type == UNSPECIFIED) {
     return Value::CreateStringValue("Unspecified");
   }
   NOTREACHED();
   return Value::CreateStringValue("");
 }
 
 ModelType ModelTypeFromValue(const Value& value) {
   if (value.IsType(Value::TYPE_STRING)) {
     std::string result;
     CHECK(value.GetAsString(&result));
@@ skipping 239 matching lines @@
   } else {
     *model_type = UNSPECIFIED;
     return false;
   }
 }
 
 bool IsRealDataType(ModelType model_type) {
   return model_type >= FIRST_REAL_MODEL_TYPE && model_type < MODEL_TYPE_COUNT;
 }
 
-}  // namespace syncable
 }  // namespace syncer