Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(485)

Unified Diff: sync/internal_api/test/test_entry_factory.cc

Issue 10696087: [Sync] Move ModelType and related classes to 'syncer' namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sort headers, update copyrights Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sync/internal_api/syncapi_unittest.cc ('k') | sync/internal_api/write_node.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/internal_api/test/test_entry_factory.cc
diff --git a/sync/internal_api/test/test_entry_factory.cc b/sync/internal_api/test/test_entry_factory.cc
index bccb4323821ca032a6ed717c3e0b0f8f6bba6a66..5527c1feeef48b6baa978eaeb6c29833a0524063 100644
--- a/sync/internal_api/test/test_entry_factory.cc
+++ b/sync/internal_api/test/test_entry_factory.cc
@@ -65,7 +65,7 @@ void TestEntryFactory::CreateUnsyncedItem(
const Id& parent_id,
const string& name,
bool is_folder,
- syncable::ModelType model_type,
+ syncer::ModelType model_type,
int64* metahandle_out) {
WriteTransaction trans(FROM_HERE, UNITTEST, directory_);
Id predecessor_id;
@@ -82,7 +82,7 @@ void TestEntryFactory::CreateUnsyncedItem(
entry.Put(syncable::PARENT_ID, parent_id);
CHECK(entry.PutPredecessor(predecessor_id));
sync_pb::EntitySpecifics default_specifics;
- syncable::AddDefaultFieldValue(model_type, &default_specifics);
+ syncer::AddDefaultFieldValue(model_type, &default_specifics);
entry.Put(syncable::SPECIFICS, default_specifics);
if (item_id.ServerKnows()) {
entry.Put(syncable::SERVER_SPECIFICS, default_specifics);
@@ -96,7 +96,7 @@ void TestEntryFactory::CreateUnsyncedItem(
int64 TestEntryFactory::CreateUnappliedAndUnsyncedItem(
const string& name,
- syncable::ModelType model_type) {
+ syncer::ModelType model_type) {
int64 metahandle = 0;
CreateUnsyncedItem(
TestIdFactory::MakeServer(name), TestIdFactory::root(),
@@ -116,7 +116,7 @@ int64 TestEntryFactory::CreateUnappliedAndUnsyncedItem(
}
int64 TestEntryFactory::CreateSyncedItem(
- const std::string& name, syncable::ModelType
+ const std::string& name, syncer::ModelType
model_type, bool is_folder) {
WriteTransaction trans(FROM_HERE, UNITTEST, directory_);
@@ -125,7 +125,7 @@ int64 TestEntryFactory::CreateSyncedItem(
int64 version = GetNextRevision();
sync_pb::EntitySpecifics default_specifics;
- syncable::AddDefaultFieldValue(model_type, &default_specifics);
+ syncer::AddDefaultFieldValue(model_type, &default_specifics);
MutableEntry entry(&trans, syncable::CREATE, parent_id, name);
if (!entry.good()) {
« no previous file with comments | « sync/internal_api/syncapi_unittest.cc ('k') | sync/internal_api/write_node.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698