Split TabRestoreService into InMemoryTRS and PersistentTRS

chrome/browser/sessions/persistent_tab_restore_service_browsertest.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 "chrome/browser/sessions/persistent_tab_restore_service.h"
+
+#include "base/compiler_specific.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/sessions/session_types_test_helper.h"
-#include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/chrome_notification_types.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/in_process_browser_test.h"
 #include "chrome/test/base/testing_profile.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_browser_thread.h"
 #include "content/public/test/test_utils.h"
 #include "content/public/test/web_contents_tester.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
 
 typedef TabRestoreService::Tab Tab;
 typedef TabRestoreService::Window Window;
 using content::WebContentsTester;
 
 using content::NavigationEntry;
 
 // Create subclass that overrides TimeNow so that we can control the time used
 // for closed tabs and windows.
-class TabRestoreTimeFactory : public TabRestoreService::TimeFactory {
+class PersistentTabRestoreTimeFactory : public TabRestoreService::TimeFactory {
  public:
-  TabRestoreTimeFactory() : time_(base::Time::Now()) {}
+  PersistentTabRestoreTimeFactory() : time_(base::Time::Now()) {}
 
-  virtual ~TabRestoreTimeFactory() {}
+  virtual ~PersistentTabRestoreTimeFactory() {}
 
   virtual base::Time TimeNow() {
     return time_;
   }
 
  private:
   base::Time time_;
 };
 
-class TabRestoreServiceTest : public ChromeRenderViewHostTestHarness {
+class PersistentTabRestoreServiceTest : public ChromeRenderViewHostTestHarness {
  public:
-  TabRestoreServiceTest()
+  PersistentTabRestoreServiceTest()
       : ui_thread_(content::BrowserThread::UI, &message_loop_) {
     url1_ = GURL("http://1");
     url2_ = GURL("http://2");
     url3_ = GURL("http://3");
     user_agent_override_ = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.19"
         " (KHTML, like Gecko) Chrome/18.0.1025.45 Safari/535.19";
   }
 
-  ~TabRestoreServiceTest() {
+  ~PersistentTabRestoreServiceTest() {
   }
 
  protected:
-  // testing::Test overrides
-  virtual void SetUp() {
+  static const size_t kMaxEntries;
+
+  // testing::Test:
+  virtual void SetUp() OVERRIDE {
     WebKit::initialize(webkit_platform_support_.Get());
     ChromeRenderViewHostTestHarness::SetUp();
-    time_factory_ = new TabRestoreTimeFactory();
-    service_.reset(new TabRestoreService(profile(), time_factory_));
+    time_factory_ = new PersistentTabRestoreTimeFactory();
+    service_.reset(new PersistentTabRestoreService(profile(), time_factory_));
   }
 
-  virtual void TearDown() {
+  virtual void TearDown() OVERRIDE {
     service_->Shutdown();
     service_.reset();
     delete time_factory_;
     ChromeRenderViewHostTestHarness::TearDown();
     WebKit::shutdown();
   }
 
+  TabRestoreService::Entries* mutable_entries() {
+    return service_->mutable_entries();
+  }
+
+  void PruneEntries() {
+    service_->PruneEntries();
+  }
+
   void AddThreeNavigations() {
     // Navigate to three URLs.
     NavigateAndCommit(url1_);
     NavigateAndCommit(url2_);
     NavigateAndCommit(url3_);
   }
 
   void NavigateToIndex(int index) {
     // Navigate back. We have to do this song and dance as NavigationController
     // isn't happy if you navigate immediately while going back.
     controller().GoToIndex(index);
     WebContentsTester::For(web_contents())->CommitPendingNavigation();
   }
 
   void RecreateService() {
     // Must set service to null first so that it is destroyed before the new
     // one is created.
     service_->Shutdown();
     service_.reset();
-    service_.reset(new TabRestoreService(profile(), time_factory_));
+    service_.reset(new PersistentTabRestoreService(profile(), time_factory_));
     service_->LoadTabsFromLastSession();
   }
 
   // Adds a window with one tab and url to the profile's session service.
   // If |pinned| is true, the tab is marked as pinned in the session service.
   void AddWindowWithOneTabToSessionService(bool pinned) {
     SessionService* session_service =
         SessionServiceFactory::GetForProfile(profile());
     SessionID tab_id;
     SessionID window_id;
@@ skipping 21 matching lines @@
     AddWindowWithOneTabToSessionService(pinned);
 
     // Set this, otherwise previous session won't be loaded.
     profile()->set_last_session_exited_cleanly(false);
   }
 
   GURL url1_;
   GURL url2_;
   GURL url3_;
   std::string user_agent_override_;
-  scoped_ptr<TabRestoreService> service_;
-  TabRestoreTimeFactory* time_factory_;
+  scoped_ptr<PersistentTabRestoreService> service_;
+  PersistentTabRestoreTimeFactory* time_factory_;
   content::RenderViewTest::RendererWebKitPlatformSupportImplNoSandbox
       webkit_platform_support_;
   content::TestBrowserThread ui_thread_;
 };
 
-TEST_F(TabRestoreServiceTest, Basic) {
+const size_t PersistentTabRestoreServiceTest::kMaxEntries =
+    TabRestoreServiceHelper::kMaxEntries;
+
+TEST_F(PersistentTabRestoreServiceTest, Basic) {
   AddThreeNavigations();
 
   // Have the service record the tab.
   service_->CreateHistoricalTab(web_contents(), -1);
 
   // Make sure an entry was created.
   ASSERT_EQ(1U, service_->entries().size());
 
   // Make sure the entry matches.
   TabRestoreService::Entry* entry = service_->entries().front();
@@ skipping 29 matching lines @@
   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(TabRestoreServiceTest, DontCreateEmptyTab) {
+TEST_F(PersistentTabRestoreServiceTest, DontCreateEmptyTab) {
   service_->CreateHistoricalTab(web_contents(), -1);
   EXPECT_TRUE(service_->entries().empty());
 }
 
 // Tests restoring a single tab.
-TEST_F(TabRestoreServiceTest, Restore) {
+TEST_F(PersistentTabRestoreServiceTest, Restore) {
   AddThreeNavigations();
 
   // Have the service record the tab.
   service_->CreateHistoricalTab(web_contents(), -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.
-  TabRestoreService::Entry* entry = service_->entries().front();
+  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(TabRestoreServiceTest, RestorePinnedAndApp) {
+TEST_F(PersistentTabRestoreServiceTest, RestorePinnedAndApp) {
   AddThreeNavigations();
 
   // Have the service record the tab.
   service_->CreateHistoricalTab(web_contents(), -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.
@@ skipping 19 matching lines @@
   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);
 }
 
 // We only restore apps on chromeos.
 #if defined(USE_AURA)
 
-typedef InProcessBrowserTest TabRestoreServiceBrowserTest;
+typedef InProcessBrowserTest PersistentTabRestoreServiceBrowserTest;
 
-IN_PROC_BROWSER_TEST_F(TabRestoreServiceBrowserTest, RestoreApp) {
+IN_PROC_BROWSER_TEST_F(PersistentTabRestoreServiceBrowserTest, RestoreApp) {
   Profile* profile = browser()->profile();
   TabRestoreService* trs = TabRestoreServiceFactory::GetForProfile(profile);
   const char* app_name = "TestApp";
 
   Browser* app_browser = CreateBrowserForApp(app_name, profile);
   app_browser->window()->Close();
   content::WindowedNotificationObserver observer(
       chrome::NOTIFICATION_BROWSER_CLOSED,
       content::Source<Browser>(app_browser));
   observer.Wait();
 
   // One entry should be created.
   ASSERT_EQ(1U, trs->entries().size());
   const TabRestoreService::Entry* restored_entry = trs->entries().front();
 
   // It should be a window with an app.
   ASSERT_EQ(TabRestoreService::WINDOW, restored_entry->type);
   const Window* restored_window =
       static_cast<const Window*>(restored_entry);
   EXPECT_EQ(app_name, restored_window->app_name);
 }
 #endif  // defined(USE_AURA)
 
 // Make sure we persist entries to disk that have post data.
-TEST_F(TabRestoreServiceTest, DontPersistPostData) {
+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);
   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(TabRestoreServiceTest, DontLoadTwice) {
+TEST_F(PersistentTabRestoreServiceTest, DontLoadTwice) {
   AddThreeNavigations();
 
   // Have the service record the tab.
   service_->CreateHistoricalTab(web_contents(), -1);
   ASSERT_EQ(1U, service_->entries().size());
 
   // Recreate the service and have it load the tabs.
   RecreateService();
 
   service_->LoadTabsFromLastSession();
 
   // There should only be one entry.
   ASSERT_EQ(1U, service_->entries().size());
 }
 
 // Makes sure we load the previous session as necessary.
-TEST_F(TabRestoreServiceTest, LoadPreviousSession) {
+TEST_F(PersistentTabRestoreServiceTest, LoadPreviousSession) {
   CreateSessionServiceWithOneWindow(false);
 
   SessionServiceFactory::GetForProfile(profile())->
       MoveCurrentSessionToLastSession();
 
   service_->LoadTabsFromLastSession();
 
   // Make sure we get back one entry with one tab whose url is url1.
   ASSERT_EQ(1U, service_->entries().size());
   TabRestoreService::Entry* entry2 = service_->entries().front();
   ASSERT_EQ(TabRestoreService::WINDOW, entry2->type);
   TabRestoreService::Window* window =
       static_cast<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());
 }
 
 // Makes sure we don't attempt to load previous sessions after a restore.
-TEST_F(TabRestoreServiceTest, DontLoadAfterRestore) {
+TEST_F(PersistentTabRestoreServiceTest, DontLoadAfterRestore) {
   CreateSessionServiceWithOneWindow(false);
 
   SessionServiceFactory::GetForProfile(profile())->
       MoveCurrentSessionToLastSession();
 
   profile()->set_restored_last_session(true);
 
   service_->LoadTabsFromLastSession();
 
-  // Because we restored a session TabRestoreService shouldn't load the tabs.
+  // Because we restored a session PersistentTabRestoreService shouldn't load
+  // the tabs.
   ASSERT_EQ(0U, service_->entries().size());
 }
 
 // Makes sure we don't attempt to load previous sessions after a clean exit.
-TEST_F(TabRestoreServiceTest, DontLoadAfterCleanExit) {
+TEST_F(PersistentTabRestoreServiceTest, DontLoadAfterCleanExit) {
   CreateSessionServiceWithOneWindow(false);
 
   SessionServiceFactory::GetForProfile(profile())->
       MoveCurrentSessionToLastSession();
 
   profile()->set_last_session_exited_cleanly(true);
 
   service_->LoadTabsFromLastSession();
 
   ASSERT_EQ(0U, service_->entries().size());
 }
 
-TEST_F(TabRestoreServiceTest, LoadPreviousSessionAndTabs) {
+TEST_F(PersistentTabRestoreServiceTest, LoadPreviousSessionAndTabs) {
   CreateSessionServiceWithOneWindow(false);
 
   SessionServiceFactory::GetForProfile(profile())->
       MoveCurrentSessionToLastSession();
 
   AddThreeNavigations();
 
   service_->CreateHistoricalTab(web_contents(), -1);
 
   RecreateService();
@@ skipping 22 matching lines @@
   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(TabRestoreServiceTest, LoadPreviousSessionAndTabsPinned) {
+TEST_F(PersistentTabRestoreServiceTest, LoadPreviousSessionAndTabsPinned) {
   CreateSessionServiceWithOneWindow(true);
 
   SessionServiceFactory::GetForProfile(profile())->
       MoveCurrentSessionToLastSession();
 
   AddThreeNavigations();
 
   service_->CreateHistoricalTab(web_contents(), -1);
 
   RecreateService();
@@ skipping 18 matching lines @@
   ASSERT_EQ(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());
 }
 
-// Creates TabRestoreService::kMaxEntries + 1 windows in the session service
-// and makes sure we only get back TabRestoreService::kMaxEntries on restore.
-TEST_F(TabRestoreServiceTest, ManyWindowsInSessionService) {
+// Creates kMaxEntries + 1 windows in the session service and makes sure we only
+// get back kMaxEntries on restore.
+TEST_F(PersistentTabRestoreServiceTest, ManyWindowsInSessionService) {
   CreateSessionServiceWithOneWindow(false);
 
-  for (size_t i = 0; i < TabRestoreService::kMaxEntries; ++i)
+  for (size_t i = 0; i < kMaxEntries; ++i)
     AddWindowWithOneTabToSessionService(false);
 
   SessionServiceFactory::GetForProfile(profile())->
       MoveCurrentSessionToLastSession();
 
   AddThreeNavigations();
 
   service_->CreateHistoricalTab(web_contents(), -1);
 
   RecreateService();
 
   // We should get back kMaxEntries entries. We added more, but
   // TabRestoreService only allows up to kMaxEntries.
-  ASSERT_EQ(TabRestoreService::kMaxEntries, service_->entries().size());
+  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(TabRestoreServiceTest, TimestampSurvivesRestore) {
+TEST_F(PersistentTabRestoreServiceTest, TimestampSurvivesRestore) {
   base::Time tab_timestamp(base::Time::FromInternalValue(123456789));
 
   AddThreeNavigations();
 
   // Have the service record the tab.
   service_->CreateHistoricalTab(web_contents(), -1);
 
   // Make sure an entry was created.
   ASSERT_EQ(1U, service_->entries().size());
 
@@ skipping 30 matching lines @@
   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(
         SessionTypesTestHelper::GetTimestamp(old_navigations[i]),
         SessionTypesTestHelper::GetTimestamp(restored_tab->navigations[i]));
   }
 }
 
-TEST_F(TabRestoreServiceTest, PruneEntries) {
+TEST_F(PersistentTabRestoreServiceTest, PruneEntries) {
   service_->ClearEntries();
   ASSERT_TRUE(service_->entries().empty());
 
-  const size_t max_entries = TabRestoreService::kMaxEntries;
+  const size_t max_entries = kMaxEntries;
   for (size_t i = 0; i < max_entries + 5; i++) {
     TabNavigation navigation =
         SessionTypesTestHelper::CreateNavigation(
             StringPrintf("http://%d", static_cast<int>(i)),
             StringPrintf("%d", static_cast<int>(i)));
 
     Tab* tab = new Tab();
     tab->navigations.push_back(navigation);
     tab->current_navigation_index = 0;
 
-    service_->entries_.push_back(tab);
+    mutable_entries()->push_back(tab);
   }
 
   // Only keep kMaxEntries around.
-  EXPECT_EQ(max_entries + 5, service_->entries_.size());
-  service_->PruneEntries();
-  EXPECT_EQ(max_entries, service_->entries_.size());
+  EXPECT_EQ(max_entries + 5, service_->entries().size());
+  PruneEntries();
+  EXPECT_EQ(max_entries, service_->entries().size());
   // Pruning again does nothing.
-  service_->PruneEntries();
-  EXPECT_EQ(max_entries, service_->entries_.size());
+  PruneEntries();
+  EXPECT_EQ(max_entries, service_->entries().size());
 
   // Prune older first.
   const char kRecentUrl[] = "http://recent";
   TabNavigation navigation =
       SessionTypesTestHelper::CreateNavigation(kRecentUrl, "Most recent");
   Tab* tab = new Tab();
   tab->navigations.push_back(navigation);
   tab->current_navigation_index = 0;
-  service_->entries_.push_front(tab);
-  EXPECT_EQ(max_entries + 1, service_->entries_.size());
-  service_->PruneEntries();
-  EXPECT_EQ(max_entries, service_->entries_.size());
+  mutable_entries()->push_front(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())->
+      static_cast<Tab*>(service_->entries().front())->
           navigations[0].virtual_url());
 
   // Ignore NTPs.
   navigation =
       SessionTypesTestHelper::CreateNavigation(
           chrome::kChromeUINewTabURL, "New tab");
 
   tab = new Tab();
   tab->navigations.push_back(navigation);
   tab->current_navigation_index = 0;
-  service_->entries_.push_front(tab);
+  mutable_entries()->push_front(tab);
 
-  EXPECT_EQ(max_entries + 1, service_->entries_.size());
-  service_->PruneEntries();
-  EXPECT_EQ(max_entries, service_->entries_.size());
+  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())->
+      static_cast<Tab*>(service_->entries().front())->
           navigations[0].virtual_url());
 
   // Don't prune pinned NTPs.
   tab = new Tab();
   tab->pinned = true;
   tab->current_navigation_index = 0;
   tab->navigations.push_back(navigation);
-  service_->entries_.push_front(tab);
-  EXPECT_EQ(max_entries + 1, service_->entries_.size());
-  service_->PruneEntries();
-  EXPECT_EQ(max_entries, service_->entries_.size());
+  mutable_entries()->push_front(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())->
+      static_cast<Tab*>(service_->entries().front())->
           navigations[0].virtual_url());
 
   // Don't prune NTPs that have multiple navigations.
   // (Erase the last NTP first.)
-  delete service_->entries_.front();
-  service_->entries_.erase(service_->entries_.begin());
+  delete service_->entries().front();
+  mutable_entries()->erase(mutable_entries()->begin());
   tab = new Tab();
   tab->current_navigation_index = 1;
   tab->navigations.push_back(navigation);
   tab->navigations.push_back(navigation);
-  service_->entries_.push_front(tab);
-  EXPECT_EQ(max_entries, service_->entries_.size());
-  service_->PruneEntries();
-  EXPECT_EQ(max_entries, service_->entries_.size());
+  mutable_entries()->push_front(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())->
+      static_cast<Tab*>(service_->entries().front())->
           navigations[1].virtual_url());
 }
 
 // Regression test for crbug.com/106082
-TEST_F(TabRestoreServiceTest, PruneIsCalled) {
+TEST_F(PersistentTabRestoreServiceTest, PruneIsCalled) {
   CreateSessionServiceWithOneWindow(false);
 
   SessionServiceFactory::GetForProfile(profile())->
       MoveCurrentSessionToLastSession();
 
   profile()->set_restored_last_session(true);
 
-  const size_t max_entries = TabRestoreService::kMaxEntries;
+  const size_t max_entries = kMaxEntries;
   for (size_t i = 0; i < max_entries + 5; i++) {
     NavigateAndCommit(GURL(StringPrintf("http://%d", static_cast<int>(i))));
     service_->CreateHistoricalTab(web_contents(), -1);
   }
 
-  EXPECT_EQ(max_entries, service_->entries_.size());
+  EXPECT_EQ(max_entries, service_->entries().size());
   // This should not crash.
   service_->LoadTabsFromLastSession();
-  EXPECT_EQ(max_entries, service_->entries_.size());
+  EXPECT_EQ(max_entries, service_->entries().size());
 }