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

chrome/browser/sync/invalidations/invalidator_storage_unittest.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/message_loop.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
@@ skipping 219 matching lines @@
   EXPECT_EQ(10, map[kAutofillId_]);
   EXPECT_EQ(15, map[kBookmarksId_]);
 }
 
 // Tests for legacy deserialization code.
 TEST_F(InvalidatorStorageTest, DeserializeMapOutOfRange) {
   InvalidationVersionMap map;
   base::DictionaryValue dict_with_out_of_range_type;
 
   dict_with_out_of_range_type.SetString(
-      base::IntToString(syncable::TOP_LEVEL_FOLDER), "100");
+      base::IntToString(syncer::TOP_LEVEL_FOLDER), "100");
   dict_with_out_of_range_type.SetString(
-      base::IntToString(syncable::BOOKMARKS), "5");
+      base::IntToString(syncer::BOOKMARKS), "5");
 
   InvalidatorStorage::DeserializeMap(&dict_with_out_of_range_type, &map);
 
   EXPECT_EQ(1U, map.size());
   EXPECT_EQ(5, map[kBookmarksId_]);
 }
 
 TEST_F(InvalidatorStorageTest, DeserializeMapInvalidFormat) {
   InvalidationVersionMap map;
   base::DictionaryValue dict_with_invalid_format;
 
   dict_with_invalid_format.SetString("whoops", "5");
   dict_with_invalid_format.SetString("ohnoes", "whoops");
   dict_with_invalid_format.SetString(
-      base::IntToString(syncable::BOOKMARKS), "ohnoes");
+      base::IntToString(syncer::BOOKMARKS), "ohnoes");
   dict_with_invalid_format.SetString(
-      base::IntToString(syncable::AUTOFILL), "10");
+      base::IntToString(syncer::AUTOFILL), "10");
 
   InvalidatorStorage::DeserializeMap(&dict_with_invalid_format, &map);
 
   EXPECT_EQ(1U, map.size());
   EXPECT_EQ(10, map[kAutofillId_]);
 }
 
 TEST_F(InvalidatorStorageTest, DeserializeMapEmptyDictionary) {
   InvalidationVersionMap map;
   base::DictionaryValue dict;
   InvalidatorStorage::DeserializeMap(&dict, &map);
   EXPECT_TRUE(map.empty());
 }
 
 TEST_F(InvalidatorStorageTest, DeserializeMapBasic) {
   InvalidationVersionMap map;
   base::DictionaryValue dict;
 
-  dict.SetString(base::IntToString(syncable::AUTOFILL), "10");
-  dict.SetString(base::IntToString(syncable::BOOKMARKS), "15");
+  dict.SetString(base::IntToString(syncer::AUTOFILL), "10");
+  dict.SetString(base::IntToString(syncer::BOOKMARKS), "15");
 
   InvalidatorStorage::DeserializeMap(&dict, &map);
   EXPECT_EQ(2U, map.size());
   EXPECT_EQ(10, map[kAutofillId_]);
   EXPECT_EQ(15, map[kBookmarksId_]);
 }
 
 // Test that the migration code for the legacy preference works as expected.
 // Migration should happen on construction of InvalidatorStorage.
 TEST_F(InvalidatorStorageTest, MigrateLegacyPreferences) {
   base::DictionaryValue* legacy_dict = new DictionaryValue;
-  legacy_dict->SetString(base::IntToString(syncable::AUTOFILL), "10");
-  legacy_dict->SetString(base::IntToString(syncable::BOOKMARKS), "32");
-  legacy_dict->SetString(base::IntToString(syncable::PREFERENCES), "54");
+  legacy_dict->SetString(base::IntToString(syncer::AUTOFILL), "10");
+  legacy_dict->SetString(base::IntToString(syncer::BOOKMARKS), "32");
+  legacy_dict->SetString(base::IntToString(syncer::PREFERENCES), "54");
   pref_service_.SetUserPref(prefs::kSyncMaxInvalidationVersions, legacy_dict);
   InvalidatorStorage storage(&pref_service_);
 
   // Legacy pref should be cleared.
   const base::DictionaryValue* dict =
       pref_service_.GetDictionary(prefs::kSyncMaxInvalidationVersions);
   EXPECT_TRUE(dict->empty());
 
   // Validate the new pref is set correctly.
   InvalidationVersionMap map;
@@ skipping 10 matching lines @@
 TEST_F(InvalidatorStorageTest, SetGetInvalidationState) {
   InvalidatorStorage storage(&pref_service_);
   const std::string mess("n\0tK\0\0l\344", 8);
   ASSERT_FALSE(IsStringUTF8(mess));
 
   storage.SetInvalidationState(mess);
   EXPECT_EQ(mess, storage.GetInvalidationState());
 }
 
 }  // namespace browser_sync