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

components/sync/syncable/model_type_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 <memory>
 #include <string>
 
 #include "base/strings/string_util.h"
 #include "base/test/values_test_util.h"
 #include "base/values.h"
@@ skipping 95 matching lines @@
 
     // This is not necessary for the mapping to be valid, but most instances of
     // UMA_HISTOGRAM that use this mapping specify MODEL_TYPE_COUNT as the
     // maximum possible value.  If you break this assumption, you should update
     // those histograms.
     EXPECT_LT(histogram_value, MODEL_TYPE_COUNT);
   }
 }
 
 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)));
   EXPECT_EQ(two, ModelTypeSetFromString(ModelTypeSetToString(two)));
 }
 
 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;
     EXPECT_TRUE(specifics.SerializeToString(&tmp));
 
     sync_pb::EntitySpecifics from_string;
     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));
   }
 }
 
 TEST_F(ModelTypeTest, ModelTypeToRootTagValues) {
   ModelTypeSet all_types = ModelTypeSet::All();
   for (ModelTypeSet::Iterator it = all_types.First(); it.Good(); it.Inc()) {
     ModelType model_type = it.Get();
     std::string root_tag = ModelTypeToRootTag(model_type);
     if (IsProxyType(model_type)) {
       EXPECT_EQ(root_tag, std::string());
@@ skipping 32 matching lines @@
       EXPECT_EQ(notified_model_type, model_type);
     } else {
       EXPECT_FALSE(ProtocolTypes().Has(model_type));
       EXPECT_TRUE(notification_type.empty());
     }
   }
 }
 
 }  // namespace
 }  // namespace syncer