Ensure Task IDs are persisted across restarts

There was a gap in the plumbing of Task IDs when we
serialize/deserialize navigation entries. The Task IDs
were not being re-set on a navigation entry when
we deserialized a navigation entry.

Bug: 983596
Change-Id: I817e1073beb16ed93b4289502ccb3e33a4094ab1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1704518Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: David Maunder <davidjm@chromium.org>
Cr-Commit-Position: refs/heads/master@{#678497}

components/sessions/content/content_serialized_navigation_builder.cc

@@ -118,6 +118,11 @@ ContentSerializedNavigationBuilder::ToNavigationEntry(
   entry->SetTimestamp(navigation->timestamp_);
   entry->SetHttpStatusCode(navigation->http_status_code_);
   entry->SetRedirectChain(navigation->redirect_chain_);
+  sessions::NavigationTaskId* navigation_task_id =
+      sessions::NavigationTaskId::Get(entry.get());
+  navigation_task_id->set_id(navigation->task_id());
+  navigation_task_id->set_parent_id(navigation->parent_task_id());
+  navigation_task_id->set_root_id(navigation->root_task_id());
 
   const ContentSerializedNavigationDriver::ExtendedInfoHandlerMap&
       extended_info_handlers = ContentSerializedNavigationDriver::GetInstance()

components/sessions/content/content_serialized_navigation_builder_unittest.cc

@@ -239,6 +239,12 @@ TEST_F(ContentSerializedNavigationBuilderTest, ToNavigationEntry) {
             new_navigation_entry->GetRedirectChain()[1]);
   EXPECT_EQ(test_data::kVirtualURL,
             new_navigation_entry->GetRedirectChain()[2]);
+  sessions::NavigationTaskId* new_navigation_task_id =
+      sessions::NavigationTaskId::Get(new_navigation_entry.get());
+
+  EXPECT_EQ(test_data::kTaskId, new_navigation_task_id->id());
+  EXPECT_EQ(test_data::kParentTaskId, new_navigation_task_id->parent_id());
+  EXPECT_EQ(test_data::kRootTaskId, new_navigation_task_id->root_id());
 
   TestData* test_data = static_cast<TestData*>(
       new_navigation_entry->GetUserData(kExtendedInfoKey1));