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

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

Issue 11474036: Remove initial_sync_ended bits (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Another rebase Created 8 years 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/test/test_entry_factory.cc ('k') | sync/sessions/sync_session.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/internal_api/test/test_user_share.cc
diff --git a/sync/internal_api/test/test_user_share.cc b/sync/internal_api/test/test_user_share.cc
index 5c7856e3aebe5a4b664effaadbdf592374ed1f50..a6147c49492198cbe153a3c866192a8ef0bafa4a 100644
--- a/sync/internal_api/test/test_user_share.cc
+++ b/sync/internal_api/test/test_user_share.cc
@@ -10,6 +10,7 @@
#include "sync/syncable/write_transaction.h"
#include "sync/test/engine/test_directory_setter_upper.h"
#include "sync/test/engine/test_id_factory.h"
+#include "sync/test/engine/test_syncable_utils.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace syncer {
@@ -53,27 +54,8 @@ syncable::TestTransactionObserver* TestUserShare::transaction_observer() {
/* static */
bool TestUserShare::CreateRoot(ModelType model_type, UserShare* user_share) {
syncer::syncable::Directory* directory = user_share->directory.get();
-
- std::string tag_name = syncer::ModelTypeToRootTag(model_type);
-
syncable::WriteTransaction wtrans(FROM_HERE, syncable::UNITTEST, directory);
- syncable::MutableEntry node(&wtrans,
- syncable::CREATE,
- wtrans.root_id(),
- tag_name);
- node.Put(syncable::UNIQUE_SERVER_TAG, tag_name);
- node.Put(syncable::IS_DIR, true);
- node.Put(syncable::SERVER_IS_DIR, false);
- node.Put(syncable::IS_UNSYNCED, false);
- node.Put(syncable::IS_UNAPPLIED_UPDATE, false);
- node.Put(syncable::SERVER_VERSION, 20);
- node.Put(syncable::BASE_VERSION, 20);
- node.Put(syncable::IS_DEL, false);
- node.Put(syncable::ID, syncer::TestIdFactory::MakeServer(tag_name));
- sync_pb::EntitySpecifics specifics;
- syncer::AddDefaultFieldValue(model_type, &specifics);
- node.Put(syncable::SPECIFICS, specifics);
-
+ CreateTypeRoot(&wtrans, directory, model_type);
return true;
}
« no previous file with comments | « sync/internal_api/test/test_entry_factory.cc ('k') | sync/sessions/sync_session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698