Revert of [Sync] Move //components/sync to the syncer namespace. (patchset #5 id:40001 of https://co

components/sync/syncable/model_type_unittest.cc

Index: components/sync/syncable/model_type_unittest.cc
diff --git a/components/sync/syncable/model_type_unittest.cc b/components/sync/syncable/model_type_unittest.cc
index 1b2d974b0d1c93aca74a113131182536caa5ba55..1984e29e1fa5cef386a997258d3455c424a41a29 100644
--- a/components/sync/syncable/model_type_unittest.cc
+++ b/components/sync/syncable/model_type_unittest.cc
@@ -113,9 +113,9 @@ TEST_F(ModelTypeTest, ModelTypeHistogramMapping) {
 }
 
 TEST_F(ModelTypeTest, ModelTypeSetFromString) {
-  ModelTypeSet empty;
-  ModelTypeSet one(BOOKMARKS);
-  ModelTypeSet two(BOOKMARKS, TYPED_URLS);
+  syncer::ModelTypeSet empty;
+  syncer::ModelTypeSet one(BOOKMARKS);
+  syncer::ModelTypeSet two(BOOKMARKS, TYPED_URLS);
 
   EXPECT_EQ(empty, ModelTypeSetFromString(ModelTypeSetToString(empty)));
   EXPECT_EQ(one, ModelTypeSetFromString(ModelTypeSetToString(one)));
@@ -123,12 +123,12 @@ TEST_F(ModelTypeTest, ModelTypeSetFromString) {
 }
 
 TEST_F(ModelTypeTest, DefaultFieldValues) {
-  ModelTypeSet types = ProtocolTypes();
+  syncer::ModelTypeSet types = syncer::ProtocolTypes();
   for (ModelTypeSet::Iterator it = types.First(); it.Good(); it.Inc()) {
     SCOPED_TRACE(ModelTypeToString(it.Get()));
 
     sync_pb::EntitySpecifics specifics;
-    AddDefaultFieldValue(it.Get(), &specifics);
+    syncer::AddDefaultFieldValue(it.Get(), &specifics);
     EXPECT_TRUE(specifics.IsInitialized());
 
     std::string tmp;
@@ -138,7 +138,7 @@ TEST_F(ModelTypeTest, DefaultFieldValues) {
     EXPECT_TRUE(from_string.ParseFromString(tmp));
     EXPECT_TRUE(from_string.IsInitialized());
 
-    EXPECT_EQ(it.Get(), GetModelTypeFromSpecifics(from_string));
+    EXPECT_EQ(it.Get(), syncer::GetModelTypeFromSpecifics(from_string));
   }
 }