[Sync] Add logic to reassociate tab nodes after restart.

chrome/browser/sync/profile_sync_service_session_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 <map>
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
@@ skipping 758 matching lines @@
 }
 
 // TODO(jhorwich): Re-enable when crbug.com/121487 addressed
 TEST_F(ProfileSyncServiceSessionTest, TabNodePoolNonEmpty) {
   CreateRootHelper create_root(this);
   ASSERT_TRUE(StartSyncService(create_root.callback(), false));
   ASSERT_TRUE(create_root.success());
 
   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());
   ASSERT_TRUE(model_associator_->tab_pool_.full());
   const size_t num_ids = 10;
   for (size_t i = 0; i < num_ids; ++i) {
     int64 id = model_associator_->tab_pool_.GetFreeTabNode();
     ASSERT_GT(id, -1);
     node_ids.push_back(id);
   }
@@ skipping 362 matching lines @@
   NavigateAndCommitActiveTab(GURL("http://bar2"));
   CreateRootHelper create_root(this);
   ASSERT_TRUE(StartSyncService(create_root.callback(), false));
   std::string local_tag = model_associator_->GetCurrentMachineTag();
   syncer::SyncError error;
 
   error = model_associator_->DisassociateModels();
   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);
     root.InitByTagLookup(syncer::ModelTypeToRootTag(syncer::SESSIONS));
     syncer::WriteNode tab_node(&trans);
     ASSERT_EQ(syncer::BaseNode::INIT_OK,
               tab_node.InitByClientTagLookup(syncer::SESSIONS, tab_tag));
     tab_node.Tombstone();
   }
   error = model_associator_->AssociateModels(NULL, NULL);
@@ skipping 69 matching lines @@
     sync_pb::SessionSpecifics specifics;
     header.SetSessionSpecifics(specifics);
   }
   // Ensure we associate properly despite the pre-existing node with our local
   // tag.
   error = model_associator_->AssociateModels(NULL, NULL);
   ASSERT_FALSE(error.IsSet());
 }
 
 }  // namespace browser_sync