Abstract WebContents/NavigationController from core TabRestore 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 "chrome/browser/sessions/persistent_tab_restore_service.h"
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/sessions/chrome_tab_restore_service_client.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/sessions/session_service_utils.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/sessions/tab_restore_service_observer.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/chrome_render_view_test.h"
 #include "chrome/test/base/testing_profile.h"
+#include "components/sessions/content/content_live_tab.h"
 #include "components/sessions/serialized_navigation_entry_test_helper.h"
 #include "components/sessions/session_types.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/render_view_test.h"
 #include "content/public/test/test_utils.h"
@@ skipping 37 matching lines @@
   ~PersistentTabRestoreServiceTest() override {}
 
  protected:
   enum {
     kMaxEntries = TabRestoreServiceHelper::kMaxEntries,
   };
 
   // testing::Test:
   void SetUp() override {
     ChromeRenderViewHostTestHarness::SetUp();
+    live_tab_ = make_scoped_ptr(new sessions::ContentLiveTab(web_contents()));
     time_factory_ = new PersistentTabRestoreTimeFactory();
     service_.reset(new PersistentTabRestoreService(
         make_scoped_ptr(new ChromeTabRestoreServiceClient(profile())),
         time_factory_));
   }
 
   void TearDown() override {
     service_->Shutdown();
     service_.reset();
     delete time_factory_;
@@ skipping 68 matching lines @@
     // Set this, otherwise previous session won't be loaded.
     profile()->set_last_session_exited_cleanly(false);
   }
 
   void SynchronousLoadTabsFromLastSession() {
     // Ensures that the load is complete before continuing.
     service_->LoadTabsFromLastSession();
     content::RunAllBlockingPoolTasksUntilIdle();
   }
 
+  sessions::LiveTab* live_tab() { return live_tab_.get(); }
+
   GURL url1_;
   GURL url2_;
   GURL url3_;
   std::string user_agent_override_;
+  scoped_ptr<sessions::LiveTab> live_tab_;
   scoped_ptr<PersistentTabRestoreService> service_;
   PersistentTabRestoreTimeFactory* time_factory_;
 };
 
 namespace {
 
 class TestTabRestoreServiceObserver : public TabRestoreServiceObserver {
  public:
   TestTabRestoreServiceObserver() : got_loaded_(false) {}
 
@@ skipping 13 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(TestTabRestoreServiceObserver);
 };
 
 }  // namespace
 
 TEST_F(PersistentTabRestoreServiceTest, Basic) {
   AddThreeNavigations();
 
   // Have the service record the tab.
-  service_->CreateHistoricalTab(web_contents(), -1);
+  service_->CreateHistoricalTab(live_tab(), -1);
 
   // Make sure an entry was created.
   ASSERT_EQ(1U, service_->entries().size());
 
   // Make sure the entry matches.
   TabRestoreService::Entry* entry = service_->entries().front();
   ASSERT_EQ(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(web_contents(), -1);
+  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();
   ASSERT_EQ(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(),
             tab->timestamp.ToInternalValue());
 }
 
 // Make sure TabRestoreService doesn't create an entry for a tab with no
 // navigations.
 TEST_F(PersistentTabRestoreServiceTest, DontCreateEmptyTab) {
-  service_->CreateHistoricalTab(web_contents(), -1);
+  service_->CreateHistoricalTab(live_tab(), -1);
   EXPECT_TRUE(service_->entries().empty());
 }
 
 // Tests restoring a single tab.
 TEST_F(PersistentTabRestoreServiceTest, Restore) {
   AddThreeNavigations();
 
   // Have the service record the tab.
-  service_->CreateHistoricalTab(web_contents(), -1);
+  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.
   PersistentTabRestoreService::Entry* entry = service_->entries().front();
   ASSERT_EQ(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(web_contents(), -1);
+  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.
   TabRestoreService::Entry* entry = service_->entries().front();
   ASSERT_EQ(TabRestoreService::TAB, entry->type);
   Tab* tab = static_cast<Tab*>(entry);
   tab->pinned = true;
@@ skipping 20 matching lines @@
 }
 
 // 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(web_contents(), -1);
+  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 TabRestoreService::Entry* restored_entry = service_->entries().front();
   ASSERT_EQ(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());
 }
 
 // Make sure we don't persist entries to disk that have post data. This
 // differs from DontPersistPostData1 in that all the navigations have post
 // data, so that nothing should be persisted.
 TEST_F(PersistentTabRestoreServiceTest, DontLoadTwice) {
   AddThreeNavigations();
 
   // Have the service record the tab.
-  service_->CreateHistoricalTab(web_contents(), -1);
+  service_->CreateHistoricalTab(live_tab(), -1);
   ASSERT_EQ(1U, service_->entries().size());
 
   // Recreate the service and have it load the tabs.
   RecreateService();
 
   SynchronousLoadTabsFromLastSession();
 
   // There should only be one entry.
   ASSERT_EQ(1U, service_->entries().size());
 }
@@ skipping 59 matching lines @@
 }
 
 TEST_F(PersistentTabRestoreServiceTest, LoadPreviousSessionAndTabs) {
   CreateSessionServiceWithOneWindow(false);
 
   SessionServiceFactory::GetForProfile(profile())->
       MoveCurrentSessionToLastSession();
 
   AddThreeNavigations();
 
-  service_->CreateHistoricalTab(web_contents(), -1);
+  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.
   TabRestoreService::Entry* entry = service_->entries().front();
   ASSERT_EQ(TabRestoreService::WINDOW, entry->type);
   TabRestoreService::Window* window =
@@ skipping 22 matching lines @@
 
 // Make sure pinned state is correctly loaded from session service.
 TEST_F(PersistentTabRestoreServiceTest, LoadPreviousSessionAndTabsPinned) {
   CreateSessionServiceWithOneWindow(true);
 
   SessionServiceFactory::GetForProfile(profile())->
       MoveCurrentSessionToLastSession();
 
   AddThreeNavigations();
 
-  service_->CreateHistoricalTab(web_contents(), -1);
+  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.
   TabRestoreService::Entry* entry = service_->entries().front();
   ASSERT_EQ(TabRestoreService::WINDOW, entry->type);
   TabRestoreService::Window* window =
@@ skipping 23 matching lines @@
   CreateSessionServiceWithOneWindow(false);
 
   for (size_t i = 0; i < kMaxEntries; ++i)
     AddWindowWithOneTabToSessionService(false);
 
   SessionServiceFactory::GetForProfile(profile())->
       MoveCurrentSessionToLastSession();
 
   AddThreeNavigations();
 
-  service_->CreateHistoricalTab(web_contents(), -1);
+  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.
   TabRestoreService::Entry* entry = service_->entries().front();
   ASSERT_EQ(TabRestoreService::WINDOW, entry->type);
   TabRestoreService::Window* window =
       static_cast<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());
 }
 
 // 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(web_contents(), -1);
+  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().
     TabRestoreService::Entry* entry = service_->entries().front();
     ASSERT_EQ(TabRestoreService::TAB, entry->type);
@@ skipping 27 matching lines @@
     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(web_contents(), -1);
+  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().
     TabRestoreService::Entry* entry = service_->entries().front();
     ASSERT_EQ(TabRestoreService::TAB, entry->type);
@@ skipping 119 matching lines @@
 
   SessionServiceFactory::GetForProfile(profile())->
       MoveCurrentSessionToLastSession();
 
   profile()->set_restored_last_session(true);
 
   const size_t max_entries = kMaxEntries;
   for (size_t i = 0; i < max_entries + 5; i++) {
     NavigateAndCommit(
         GURL(base::StringPrintf("http://%d", static_cast<int>(i))));
-    service_->CreateHistoricalTab(web_contents(), -1);
+    service_->CreateHistoricalTab(live_tab(), -1);
   }
 
   EXPECT_EQ(max_entries, service_->entries().size());
   // This should not crash.
   SynchronousLoadTabsFromLastSession();
   EXPECT_EQ(max_entries, service_->entries().size());
 }
 
 // Makes sure invoking LoadTabsFromLastSession() when the max number of entries
 // have been added results in IsLoaded() returning true and notifies observers.
 TEST_F(PersistentTabRestoreServiceTest, GoToLoadedWhenHaveMaxEntries) {
   const size_t max_entries = kMaxEntries;
   for (size_t i = 0; i < max_entries + 5; i++) {
     NavigateAndCommit(
         GURL(base::StringPrintf("http://%d", static_cast<int>(i))));
-    service_->CreateHistoricalTab(web_contents(), -1);
+    service_->CreateHistoricalTab(live_tab(), -1);
   }
 
   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);
 }