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

components/sync/test/engine/test_syncable_utils.cc

 // Copyright 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.
 
 // Utilities to verify the state of items in unit tests.
 
 #include "components/sync/test/engine/test_syncable_utils.h"
 
 #include "components/sync/syncable/directory.h"
 #include "components/sync/syncable/entry.h"
@@ skipping 50 matching lines @@
 Id GetOnlyEntryWithName(BaseTransaction* rtrans,
                         const syncable::Id& parent_id,
                         const string& name) {
   CHECK_EQ(1, CountEntriesWithName(rtrans, parent_id, name));
   return GetFirstEntryWithName(rtrans, parent_id, name);
 }
 
 void CreateTypeRoot(WriteTransaction* trans,
                     syncable::Directory* dir,
                     ModelType type) {
-  std::string tag_name = ModelTypeToRootTag(type);
+  std::string tag_name = syncer::ModelTypeToRootTag(type);
   syncable::MutableEntry node(trans, syncable::CREATE, type,
                               TestIdFactory::root(), tag_name);
   DCHECK(node.good());
   node.PutUniqueServerTag(tag_name);
   node.PutIsDir(true);
   node.PutServerIsDir(false);
   node.PutIsUnsynced(false);
   node.PutIsUnappliedUpdate(false);
   node.PutServerVersion(20);
   node.PutBaseVersion(20);
   node.PutIsDel(false);
-  node.PutId(TestIdFactory::MakeServer(tag_name));
+  node.PutId(syncer::TestIdFactory::MakeServer(tag_name));
   sync_pb::EntitySpecifics specifics;
-  AddDefaultFieldValue(type, &specifics);
+  syncer::AddDefaultFieldValue(type, &specifics);
   node.PutServerSpecifics(specifics);
   node.PutSpecifics(specifics);
 }
 
 sync_pb::DataTypeProgressMarker BuildProgress(ModelType type) {
   sync_pb::DataTypeProgressMarker progress;
   progress.set_token("token");
   progress.set_data_type_id(GetSpecificsFieldNumberFromModelType(type));
   return progress;
 }
 
 }  // namespace syncable
 }  // namespace syncer