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

chrome/browser/sync/invalidations/invalidator_storage.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 "chrome/browser/sync/invalidations/invalidator_storage.h"
 
 #include "base/base64.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/string_number_conversions.h"
@@ skipping 168 matching lines @@
   // Convert from a string -> string DictionaryValue to a
   // ModelType -> int64 map.
   for (base::DictionaryValue::key_iterator it =
            max_versions_dict->begin_keys();
        it != max_versions_dict->end_keys(); ++it) {
     int model_type_int = 0;
     if (!base::StringToInt(*it, &model_type_int)) {
       LOG(WARNING) << "Invalid model type key: " << *it;
       continue;
     }
-    if ((model_type_int < syncable::FIRST_REAL_MODEL_TYPE) ||
-        (model_type_int >= syncable::MODEL_TYPE_COUNT)) {
+    if ((model_type_int < syncer::FIRST_REAL_MODEL_TYPE) ||
+        (model_type_int >= syncer::MODEL_TYPE_COUNT)) {
       LOG(WARNING) << "Out-of-range model type key: " << model_type_int;
       continue;
     }
-    const syncable::ModelType model_type =
-        syncable::ModelTypeFromInt(model_type_int);
+    const syncer::ModelType model_type =
+        syncer::ModelTypeFromInt(model_type_int);
     std::string max_version_str;
     CHECK(max_versions_dict->GetString(*it, &max_version_str));
     int64 max_version = 0;
     if (!base::StringToInt64(max_version_str, &max_version)) {
       LOG(WARNING) << "Invalid max invalidation version for "
-                   << syncable::ModelTypeToString(model_type) << ": "
+                   << syncer::ModelTypeToString(model_type) << ": "
                    << max_version_str;
       continue;
     }
     invalidation::ObjectId id;
     if (!syncer::RealModelTypeToObjectId(model_type, &id)) {
       DLOG(WARNING) << "Invalid model type: " << model_type;
       continue;
     }
     (*map)[id] = max_version;
   }
@@ skipping 15 matching lines @@
                            utf8_state);
 }
 
 void InvalidatorStorage::Clear() {
   DCHECK(thread_checker_.CalledOnValidThread());
   pref_service_->ClearPref(prefs::kInvalidatorMaxInvalidationVersions);
   pref_service_->ClearPref(prefs::kInvalidatorInvalidationState);
 }
 
 }  // namespace browser_sync