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

Unified Diff: chrome/browser/sync/profile_sync_service_session_unittest.cc

Issue 16421003: [Sync] Add logic to reassociate tab nodes after restart. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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
Index: chrome/browser/sync/profile_sync_service_session_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_service_session_unittest.cc b/chrome/browser/sync/profile_sync_service_session_unittest.cc
index 7aac919ab7b52a530e862870643023e15429d2fa..a214efa2bc0407c02801a34ec16698bd4c1bd245 100644
--- a/chrome/browser/sync/profile_sync_service_session_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_session_unittest.cc
@@ -776,9 +776,10 @@ TEST_F(ProfileSyncServiceSessionTest, TabNodePoolNonEmpty) {
const size_t num_starting_nodes = 3;
for (size_t i = 0; i < num_starting_nodes; ++i) {
- model_associator_->tab_pool_.AddTabNode(i);
+ model_associator_->tab_pool_.AddOldTabNode(i + 1, i);
}
+ model_associator_->tab_pool_.FreeUnusedOldSyncNodes(std::set<int64>());
std::vector<int64> node_ids;
ASSERT_EQ(num_starting_nodes, model_associator_->tab_pool_.capacity());
ASSERT_FALSE(model_associator_->tab_pool_.empty());
@@ -1161,7 +1162,7 @@ TEST_F(ProfileSyncServiceSessionTest, MissingLocalTabNode) {
ASSERT_FALSE(error.IsSet());
{
// Delete the first sync tab node.
- std::string tab_tag = TabNodePool::TabIdToTag(local_tag, 0);
+ std::string tab_tag = TabNodePool::TabIdToTag(local_tag, 1);
syncer::WriteTransaction trans(FROM_HERE, sync_service_->GetUserShare());
syncer::ReadNode root(&trans);

Powered by Google App Engine
This is Rietveld 408576698