Make TabRestoreService::Entry noncopyable and fix up surrounding code.

chrome/browser/sessions/persistent_tab_restore_service_unittest.cc

 // Copyright 2013 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 "components/sessions/core/persistent_tab_restore_service.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
@@ skipping 208 matching lines @@
 TEST_F(PersistentTabRestoreServiceTest, Basic) {
   AddThreeNavigations();
 
   // Have the service record the tab.
   service_->CreateHistoricalTab(live_tab(), -1);
 
   // Make sure an entry was created.
   ASSERT_EQ(1U, service_->entries().size());
 
   // Make sure the entry matches.
-  sessions::TabRestoreService::Entry* entry = service_->entries().front();
+  sessions::TabRestoreService::Entry* entry = service_->entries().front().get();
   ASSERT_EQ(sessions::TabRestoreService::TAB, entry->type);
   Tab* tab = static_cast<Tab*>(entry);
   EXPECT_FALSE(tab->pinned);
   EXPECT_TRUE(tab->extension_app_id.empty());
   ASSERT_EQ(3U, tab->navigations.size());
   EXPECT_TRUE(url1_ == tab->navigations[0].virtual_url());
   EXPECT_TRUE(url2_ == tab->navigations[1].virtual_url());
   EXPECT_TRUE(url3_ == tab->navigations[2].virtual_url());
   EXPECT_EQ("", tab->user_agent_override);
   EXPECT_EQ(2, tab->current_navigation_index);
   EXPECT_EQ(time_factory_->TimeNow().ToInternalValue(),
             tab->timestamp.ToInternalValue());
 
   NavigateToIndex(1);
 
   // And check again, but set the user agent override this time.
   web_contents()->SetUserAgentOverride(user_agent_override_);
   service_->CreateHistoricalTab(live_tab(), -1);
 
   // There should be two entries now.
   ASSERT_EQ(2U, service_->entries().size());
 
   // Make sure the entry matches.
-  entry = service_->entries().front();
+  entry = service_->entries().front().get();
   ASSERT_EQ(sessions::TabRestoreService::TAB, entry->type);
   tab = static_cast<Tab*>(entry);
   EXPECT_FALSE(tab->pinned);
   ASSERT_EQ(3U, tab->navigations.size());
   EXPECT_EQ(url1_, tab->navigations[0].virtual_url());
   EXPECT_EQ(url2_, tab->navigations[1].virtual_url());
   EXPECT_EQ(url3_, tab->navigations[2].virtual_url());
   EXPECT_EQ(user_agent_override_, tab->user_agent_override);
   EXPECT_EQ(1, tab->current_navigation_index);
   EXPECT_EQ(time_factory_->TimeNow().ToInternalValue(),
@@ skipping 15 matching lines @@
   service_->CreateHistoricalTab(live_tab(), -1);
 
   // Recreate the service and have it load the tabs.
   RecreateService();
 
   // One entry should be created.
   ASSERT_EQ(1U, service_->entries().size());
 
   // And verify the entry.
   sessions::PersistentTabRestoreService::Entry* entry =
-      service_->entries().front();
+      service_->entries().front().get();
   ASSERT_EQ(sessions::TabRestoreService::TAB, entry->type);
   Tab* tab = static_cast<Tab*>(entry);
   EXPECT_FALSE(tab->pinned);
   ASSERT_EQ(3U, tab->navigations.size());
   EXPECT_TRUE(url1_ == tab->navigations[0].virtual_url());
   EXPECT_TRUE(url2_ == tab->navigations[1].virtual_url());
   EXPECT_TRUE(url3_ == tab->navigations[2].virtual_url());
   EXPECT_EQ(2, tab->current_navigation_index);
   EXPECT_EQ(time_factory_->TimeNow().ToInternalValue(),
             tab->timestamp.ToInternalValue());
 }
 
 // Tests restoring a single pinned tab.
 TEST_F(PersistentTabRestoreServiceTest, RestorePinnedAndApp) {
   AddThreeNavigations();
 
   // Have the service record the tab.
   service_->CreateHistoricalTab(live_tab(), -1);
 
   // One entry should be created.
   ASSERT_EQ(1U, service_->entries().size());
 
   // We have to explicitly mark the tab as pinned as there is no browser for
   // these tests.
-  sessions::TabRestoreService::Entry* entry = service_->entries().front();
+  sessions::TabRestoreService::Entry* entry = service_->entries().front().get();
   ASSERT_EQ(sessions::TabRestoreService::TAB, entry->type);
   Tab* tab = static_cast<Tab*>(entry);
   tab->pinned = true;
   const std::string extension_app_id("test");
   tab->extension_app_id = extension_app_id;
 
   // Recreate the service and have it load the tabs.
   RecreateService();
 
   // One entry should be created.
   ASSERT_EQ(1U, service_->entries().size());
 
   // And verify the entry.
-  entry = service_->entries().front();
+  entry = service_->entries().front().get();
   ASSERT_EQ(sessions::TabRestoreService::TAB, entry->type);
   tab = static_cast<Tab*>(entry);
   EXPECT_TRUE(tab->pinned);
   ASSERT_EQ(3U, tab->navigations.size());
   EXPECT_TRUE(url1_ == tab->navigations[0].virtual_url());
   EXPECT_TRUE(url2_ == tab->navigations[1].virtual_url());
   EXPECT_TRUE(url3_ == tab->navigations[2].virtual_url());
   EXPECT_EQ(2, tab->current_navigation_index);
   EXPECT_TRUE(extension_app_id == tab->extension_app_id);
 }
 
 // Make sure we persist entries to disk that have post data.
 TEST_F(PersistentTabRestoreServiceTest, DontPersistPostData) {
   AddThreeNavigations();
   controller().GetEntryAtIndex(0)->SetHasPostData(true);
   controller().GetEntryAtIndex(1)->SetHasPostData(true);
   controller().GetEntryAtIndex(2)->SetHasPostData(true);
 
   // Have the service record the tab.
   service_->CreateHistoricalTab(live_tab(), -1);
   ASSERT_EQ(1U, service_->entries().size());
 
   // Recreate the service and have it load the tabs.
   RecreateService();
 
   // One entry should be created.
   ASSERT_EQ(1U, service_->entries().size());
 
   const sessions::TabRestoreService::Entry* restored_entry =
-      service_->entries().front();
+      service_->entries().front().get();
   ASSERT_EQ(sessions::TabRestoreService::TAB, restored_entry->type);
 
   const Tab* restored_tab =
       static_cast<const Tab*>(restored_entry);
   // There should be 3 navs.
   ASSERT_EQ(3U, restored_tab->navigations.size());
   EXPECT_EQ(time_factory_->TimeNow().ToInternalValue(),
             restored_tab->timestamp.ToInternalValue());
 }
 
@@ skipping 26 matching lines @@
   EXPECT_FALSE(service_->IsLoaded());
 
   TestTabRestoreServiceObserver observer;
   service_->AddObserver(&observer);
   SynchronousLoadTabsFromLastSession();
   EXPECT_TRUE(observer.got_loaded());
   service_->RemoveObserver(&observer);
 
   // Make sure we get back one entry with one tab whose url is url1.
   ASSERT_EQ(1U, service_->entries().size());
-  sessions::TabRestoreService::Entry* entry2 = service_->entries().front();
+  sessions::TabRestoreService::Entry* entry2 =
+      service_->entries().front().get();
   ASSERT_EQ(sessions::TabRestoreService::WINDOW, entry2->type);
   sessions::TabRestoreService::Window* window =
       static_cast<sessions::TabRestoreService::Window*>(entry2);
   ASSERT_EQ(1U, window->tabs.size());
   EXPECT_EQ(0, window->timestamp.ToInternalValue());
   EXPECT_EQ(0, window->selected_tab_index);
-  ASSERT_EQ(1U, window->tabs[0].navigations.size());
-  EXPECT_EQ(0, window->tabs[0].current_navigation_index);
-  EXPECT_EQ(0, window->tabs[0].timestamp.ToInternalValue());
-  EXPECT_TRUE(url1_ == window->tabs[0].navigations[0].virtual_url());
+  ASSERT_EQ(1U, window->tabs[0]->navigations.size());
+  EXPECT_EQ(0, window->tabs[0]->current_navigation_index);
+  EXPECT_EQ(0, window->tabs[0]->timestamp.ToInternalValue());
+  EXPECT_TRUE(url1_ == window->tabs[0]->navigations[0].virtual_url());
 }
 
 // Makes sure we don't attempt to load previous sessions after a restore.
 TEST_F(PersistentTabRestoreServiceTest, DontLoadAfterRestore) {
   CreateSessionServiceWithOneWindow(false);
 
   SessionServiceFactory::GetForProfile(profile())->
       MoveCurrentSessionToLastSession();
 
   profile()->set_restored_last_session(true);
@@ skipping 28 matching lines @@
   AddThreeNavigations();
 
   service_->CreateHistoricalTab(live_tab(), -1);
 
   RecreateService();
 
   // We should get back two entries, one from the previous session and one from
   // the tab restore service. The previous session entry should be first.
   ASSERT_EQ(2U, service_->entries().size());
   // The first entry should come from the session service.
-  sessions::TabRestoreService::Entry* entry = service_->entries().front();
+  sessions::TabRestoreService::Entry* entry = service_->entries().front().get();
   ASSERT_EQ(sessions::TabRestoreService::WINDOW, entry->type);
   sessions::TabRestoreService::Window* window =
       static_cast<sessions::TabRestoreService::Window*>(entry);
   ASSERT_EQ(1U, window->tabs.size());
   EXPECT_EQ(0, window->selected_tab_index);
   EXPECT_EQ(0, window->timestamp.ToInternalValue());
-  ASSERT_EQ(1U, window->tabs[0].navigations.size());
-  EXPECT_EQ(0, window->tabs[0].current_navigation_index);
-  EXPECT_EQ(0, window->tabs[0].timestamp.ToInternalValue());
-  EXPECT_TRUE(url1_ == window->tabs[0].navigations[0].virtual_url());
+  ASSERT_EQ(1U, window->tabs[0]->navigations.size());
+  EXPECT_EQ(0, window->tabs[0]->current_navigation_index);
+  EXPECT_EQ(0, window->tabs[0]->timestamp.ToInternalValue());
+  EXPECT_TRUE(url1_ == window->tabs[0]->navigations[0].virtual_url());
 
   // Then the closed tab.
-  entry = *(++service_->entries().begin());
+  entry = (++service_->entries().begin())->get();
   ASSERT_EQ(sessions::TabRestoreService::TAB, entry->type);
   Tab* tab = static_cast<Tab*>(entry);
   ASSERT_FALSE(tab->pinned);
   ASSERT_EQ(3U, tab->navigations.size());
   EXPECT_EQ(2, tab->current_navigation_index);
   EXPECT_EQ(time_factory_->TimeNow().ToInternalValue(),
             tab->timestamp.ToInternalValue());
   EXPECT_TRUE(url1_ == tab->navigations[0].virtual_url());
   EXPECT_TRUE(url2_ == tab->navigations[1].virtual_url());
   EXPECT_TRUE(url3_ == tab->navigations[2].virtual_url());
 }
 
 // Make sure pinned state is correctly loaded from session service.
 TEST_F(PersistentTabRestoreServiceTest, LoadPreviousSessionAndTabsPinned) {
   CreateSessionServiceWithOneWindow(true);
 
   SessionServiceFactory::GetForProfile(profile())->
       MoveCurrentSessionToLastSession();
 
   AddThreeNavigations();
 
   service_->CreateHistoricalTab(live_tab(), -1);
 
   RecreateService();
 
   // We should get back two entries, one from the previous session and one from
   // the tab restore service. The previous session entry should be first.
   ASSERT_EQ(2U, service_->entries().size());
   // The first entry should come from the session service.
-  sessions::TabRestoreService::Entry* entry = service_->entries().front();
+  sessions::TabRestoreService::Entry* entry = service_->entries().front().get();
   ASSERT_EQ(sessions::TabRestoreService::WINDOW, entry->type);
   sessions::TabRestoreService::Window* window =
       static_cast<sessions::TabRestoreService::Window*>(entry);
   ASSERT_EQ(1U, window->tabs.size());
   EXPECT_EQ(0, window->selected_tab_index);
-  EXPECT_TRUE(window->tabs[0].pinned);
-  ASSERT_EQ(1U, window->tabs[0].navigations.size());
-  EXPECT_EQ(0, window->tabs[0].current_navigation_index);
-  EXPECT_TRUE(url1_ == window->tabs[0].navigations[0].virtual_url());
+  EXPECT_TRUE(window->tabs[0]->pinned);
+  ASSERT_EQ(1U, window->tabs[0]->navigations.size());
+  EXPECT_EQ(0, window->tabs[0]->current_navigation_index);
+  EXPECT_TRUE(url1_ == window->tabs[0]->navigations[0].virtual_url());
 
   // Then the closed tab.
-  entry = *(++service_->entries().begin());
+  entry = (++service_->entries().begin())->get();
   ASSERT_EQ(sessions::TabRestoreService::TAB, entry->type);
   Tab* tab = static_cast<Tab*>(entry);
   ASSERT_FALSE(tab->pinned);
   ASSERT_EQ(3U, tab->navigations.size());
   EXPECT_EQ(2, tab->current_navigation_index);
   EXPECT_TRUE(url1_ == tab->navigations[0].virtual_url());
   EXPECT_TRUE(url2_ == tab->navigations[1].virtual_url());
   EXPECT_TRUE(url3_ == tab->navigations[2].virtual_url());
 }
 
@@ skipping 12 matching lines @@
 
   service_->CreateHistoricalTab(live_tab(), -1);
 
   RecreateService();
 
   // We should get back kMaxEntries entries. We added more, but
   // TabRestoreService only allows up to kMaxEntries.
   ASSERT_EQ(kMaxEntries, service_->entries().size());
 
   // The first entry should come from the session service.
-  sessions::TabRestoreService::Entry* entry = service_->entries().front();
+  sessions::TabRestoreService::Entry* entry = service_->entries().front().get();
   ASSERT_EQ(sessions::TabRestoreService::WINDOW, entry->type);
   sessions::TabRestoreService::Window* window =
       static_cast<sessions::TabRestoreService::Window*>(entry);
   ASSERT_EQ(1U, window->tabs.size());
   EXPECT_EQ(0, window->selected_tab_index);
   EXPECT_EQ(0, window->timestamp.ToInternalValue());
-  ASSERT_EQ(1U, window->tabs[0].navigations.size());
-  EXPECT_EQ(0, window->tabs[0].current_navigation_index);
-  EXPECT_EQ(0, window->tabs[0].timestamp.ToInternalValue());
-  EXPECT_TRUE(url1_ == window->tabs[0].navigations[0].virtual_url());
+  ASSERT_EQ(1U, window->tabs[0]->navigations.size());
+  EXPECT_EQ(0, window->tabs[0]->current_navigation_index);
+  EXPECT_EQ(0, window->tabs[0]->timestamp.ToInternalValue());
+  EXPECT_TRUE(url1_ == window->tabs[0]->navigations[0].virtual_url());
 }
 
 // Makes sure we restore timestamps correctly.
 TEST_F(PersistentTabRestoreServiceTest, TimestampSurvivesRestore) {
   base::Time tab_timestamp(base::Time::FromInternalValue(123456789));
 
   AddThreeNavigations();
 
   // Have the service record the tab.
   service_->CreateHistoricalTab(live_tab(), -1);
 
   // Make sure an entry was created.
   ASSERT_EQ(1U, service_->entries().size());
 
   // Make sure the entry matches.
   std::vector<SerializedNavigationEntry> old_navigations;
   {
     // |entry|/|tab| doesn't survive after RecreateService().
-    sessions::TabRestoreService::Entry* entry = service_->entries().front();
+    sessions::TabRestoreService::Entry* entry =
+        service_->entries().front().get();
     ASSERT_EQ(sessions::TabRestoreService::TAB, entry->type);
     Tab* tab = static_cast<Tab*>(entry);
     tab->timestamp = tab_timestamp;
     old_navigations = tab->navigations;
   }
 
   EXPECT_EQ(3U, old_navigations.size());
   for (size_t i = 0; i < old_navigations.size(); ++i) {
     EXPECT_FALSE(old_navigations[i].timestamp().is_null());
   }
 
   // Set this, otherwise previous session won't be loaded.
   profile()->set_last_session_exited_cleanly(false);
 
   RecreateService();
 
   // One entry should be created.
   ASSERT_EQ(1U, service_->entries().size());
 
   // And verify the entry.
   sessions::TabRestoreService::Entry* restored_entry =
-      service_->entries().front();
+      service_->entries().front().get();
   ASSERT_EQ(sessions::TabRestoreService::TAB, restored_entry->type);
   Tab* restored_tab =
       static_cast<Tab*>(restored_entry);
   EXPECT_EQ(tab_timestamp.ToInternalValue(),
             restored_tab->timestamp.ToInternalValue());
   ASSERT_EQ(old_navigations.size(), restored_tab->navigations.size());
   for (size_t i = 0; i < restored_tab->navigations.size(); ++i) {
     EXPECT_EQ(old_navigations[i].timestamp(),
               restored_tab->navigations[i].timestamp());
   }
 }
 
 // Makes sure we restore status codes correctly.
 TEST_F(PersistentTabRestoreServiceTest, StatusCodesSurviveRestore) {
   AddThreeNavigations();
 
   // Have the service record the tab.
   service_->CreateHistoricalTab(live_tab(), -1);
 
   // Make sure an entry was created.
   ASSERT_EQ(1U, service_->entries().size());
 
   // Make sure the entry matches.
   std::vector<sessions::SerializedNavigationEntry> old_navigations;
   {
     // |entry|/|tab| doesn't survive after RecreateService().
-    sessions::TabRestoreService::Entry* entry = service_->entries().front();
+    sessions::TabRestoreService::Entry* entry =
+        service_->entries().front().get();
     ASSERT_EQ(sessions::TabRestoreService::TAB, entry->type);
     Tab* tab = static_cast<Tab*>(entry);
     old_navigations = tab->navigations;
   }
 
   EXPECT_EQ(3U, old_navigations.size());
   for (size_t i = 0; i < old_navigations.size(); ++i) {
     EXPECT_EQ(200, old_navigations[i].http_status_code());
   }
 
   // Set this, otherwise previous session won't be loaded.
   profile()->set_last_session_exited_cleanly(false);
 
   RecreateService();
 
   // One entry should be created.
   ASSERT_EQ(1U, service_->entries().size());
 
   // And verify the entry.
   sessions::TabRestoreService::Entry* restored_entry =
-      service_->entries().front();
+      service_->entries().front().get();
   ASSERT_EQ(sessions::TabRestoreService::TAB, restored_entry->type);
   Tab* restored_tab =
       static_cast<Tab*>(restored_entry);
   ASSERT_EQ(old_navigations.size(), restored_tab->navigations.size());
   for (size_t i = 0; i < restored_tab->navigations.size(); ++i) {
     EXPECT_EQ(200, restored_tab->navigations[i].http_status_code());
   }
 }
 
 TEST_F(PersistentTabRestoreServiceTest, PruneEntries) {
   service_->ClearEntries();
   ASSERT_TRUE(service_->entries().empty());
 
   const size_t max_entries = kMaxEntries;
   for (size_t i = 0; i < max_entries + 5; i++) {
     SerializedNavigationEntry navigation =
         SerializedNavigationEntryTestHelper::CreateNavigation(
             base::StringPrintf("http://%d", static_cast<int>(i)),
             base::SizeTToString(i));
 
-    Tab* tab = new Tab();
+    auto tab = base::MakeUnique<Tab>();
     tab->navigations.push_back(navigation);
     tab->current_navigation_index = 0;
 
-    mutable_entries()->push_back(tab);
+    mutable_entries()->push_back(std::move(tab));
   }
 
   // Only keep kMaxEntries around.
   EXPECT_EQ(max_entries + 5, service_->entries().size());
   PruneEntries();
   EXPECT_EQ(max_entries, service_->entries().size());
   // Pruning again does nothing.
   PruneEntries();
   EXPECT_EQ(max_entries, service_->entries().size());
 
   // Prune older first.
   const char kRecentUrl[] = "http://recent";
   SerializedNavigationEntry navigation =
       SerializedNavigationEntryTestHelper::CreateNavigation(kRecentUrl,
                                                             "Most recent");
-  Tab* tab = new Tab();
+  auto tab = base::MakeUnique<Tab>();
   tab->navigations.push_back(navigation);
   tab->current_navigation_index = 0;
-  mutable_entries()->push_front(tab);
+  mutable_entries()->push_front(std::move(tab));
   EXPECT_EQ(max_entries + 1, service_->entries().size());
   PruneEntries();
   EXPECT_EQ(max_entries, service_->entries().size());
-  EXPECT_EQ(GURL(kRecentUrl),
-      static_cast<Tab*>(service_->entries().front())->
-          navigations[0].virtual_url());
+  EXPECT_EQ(GURL(kRecentUrl), static_cast<Tab&>(*service_->entries().front())
+                                  .navigations[0]
+                                  .virtual_url());
 
   // Ignore NTPs.
   navigation = SerializedNavigationEntryTestHelper::CreateNavigation(
       chrome::kChromeUINewTabURL, "New tab");
 
-  tab = new Tab();
+  tab = base::MakeUnique<Tab>();
   tab->navigations.push_back(navigation);
   tab->current_navigation_index = 0;
-  mutable_entries()->push_front(tab);
+  mutable_entries()->push_front(std::move(tab));
 
   EXPECT_EQ(max_entries + 1, service_->entries().size());
   PruneEntries();
   EXPECT_EQ(max_entries, service_->entries().size());
-  EXPECT_EQ(GURL(kRecentUrl),
-      static_cast<Tab*>(service_->entries().front())->
-          navigations[0].virtual_url());
+  EXPECT_EQ(GURL(kRecentUrl), static_cast<Tab&>(*service_->entries().front())
+                                  .navigations[0]
+                                  .virtual_url());
 
   // Don't prune pinned NTPs.
-  tab = new Tab();
+  tab = base::MakeUnique<Tab>();
   tab->pinned = true;
   tab->current_navigation_index = 0;
   tab->navigations.push_back(navigation);
-  mutable_entries()->push_front(tab);
+  mutable_entries()->push_front(std::move(tab));
   EXPECT_EQ(max_entries + 1, service_->entries().size());
   PruneEntries();
   EXPECT_EQ(max_entries, service_->entries().size());
   EXPECT_EQ(GURL(chrome::kChromeUINewTabURL),
-            static_cast<Tab*>(service_->entries().front())->
-            navigations[0].virtual_url());
+            static_cast<Tab*>(service_->entries().front().get())
+                ->navigations[0]
+                .virtual_url());
 
   // Don't prune NTPs that have multiple navigations.
   // (Erase the last NTP first.)
-  delete service_->entries().front();
   mutable_entries()->erase(mutable_entries()->begin());
-  tab = new Tab();
+  tab = base::MakeUnique<Tab>();
   tab->current_navigation_index = 1;
   tab->navigations.push_back(navigation);
   tab->navigations.push_back(navigation);
-  mutable_entries()->push_front(tab);
+  mutable_entries()->push_front(std::move(tab));
   EXPECT_EQ(max_entries, service_->entries().size());
   PruneEntries();
   EXPECT_EQ(max_entries, service_->entries().size());
   EXPECT_EQ(GURL(chrome::kChromeUINewTabURL),
-            static_cast<Tab*>(service_->entries().front())->
-            navigations[1].virtual_url());
+            static_cast<Tab*>(service_->entries().front().get())
+                ->navigations[1]
+                .virtual_url());
 }
 
 // Regression test for crbug.com/106082
 TEST_F(PersistentTabRestoreServiceTest, PruneIsCalled) {
   CreateSessionServiceWithOneWindow(false);
 
   SessionServiceFactory::GetForProfile(profile())->
       MoveCurrentSessionToLastSession();
 
   profile()->set_restored_last_session(true);
@@ skipping 23 matching lines @@
 
   EXPECT_FALSE(service_->IsLoaded());
   TestTabRestoreServiceObserver observer;
   service_->AddObserver(&observer);
   EXPECT_EQ(max_entries, service_->entries().size());
   SynchronousLoadTabsFromLastSession();
   EXPECT_TRUE(observer.got_loaded());
   EXPECT_TRUE(service_->IsLoaded());
   service_->RemoveObserver(&observer);
 }