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

chrome/browser/sync/profile_sync_service_session_unittest.cc

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..b4a15d6dc44d1fbd76a4c0c50d2f1f4a3ee1d518 100644
--- a/chrome/browser/sync/profile_sync_service_session_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_session_unittest.cc
@@ -756,6 +756,8 @@ TEST_F(ProfileSyncServiceSessionTest, TabNodePoolEmpty) {
     int64 id = model_associator_->tab_pool_.GetFreeTabNode();
     ASSERT_GT(id, -1);
     node_ids.push_back(id);
+    // Associate with a tab node.
+    model_associator_->tab_pool_.AssociateTabNode(id, i + 1);
   }
   ASSERT_EQ(num_ids, model_associator_->tab_pool_.capacity());
   ASSERT_TRUE(model_associator_->tab_pool_.empty());
@@ -775,10 +777,13 @@ TEST_F(ProfileSyncServiceSessionTest, TabNodePoolNonEmpty) {
   ASSERT_TRUE(create_root.success());
 
   const size_t num_starting_nodes = 3;
+  SessionID session_id;
   for (size_t i = 0; i < num_starting_nodes; ++i) {
-    model_associator_->tab_pool_.AddTabNode(i);
+    session_id.set_id(i + 1);
+    model_associator_->tab_pool_.AddTabNode(i + 1, session_id, i);
   }
 
+  model_associator_->tab_pool_.FreeUnusedTabNodes(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());
@@ -788,6 +793,8 @@ TEST_F(ProfileSyncServiceSessionTest, TabNodePoolNonEmpty) {
     int64 id = model_associator_->tab_pool_.GetFreeTabNode();
     ASSERT_GT(id, -1);
     node_ids.push_back(id);
+    // Associate with a tab node.
+    model_associator_->tab_pool_.AssociateTabNode(id, i + 1);
   }
   ASSERT_EQ(num_ids, model_associator_->tab_pool_.capacity());
   ASSERT_TRUE(model_associator_->tab_pool_.empty());
@@ -1161,7 +1168,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);