Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(52)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/sessions/persistent_tab_restore_service_unittest.cc

Issue 1350653004: [sessions] Properly namespace recently-componentized TabRestore code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Mac Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sessions/persistent_tab_restore_service_browsertest.cc ('k') | chrome/browser/sessions/session_restore_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sessions/persistent_tab_restore_service_unittest.cc
diff --git a/chrome/browser/sessions/persistent_tab_restore_service_unittest.cc b/chrome/browser/sessions/persistent_tab_restore_service_unittest.cc
index f706477f45a48fa3d22adc59f68b1f9e6ec94a31..baf241ce62b114e4ecc74d37ea80d1b15ee33481 100644
--- a/chrome/browser/sessions/persistent_tab_restore_service_unittest.cc
+++ b/chrome/browser/sessions/persistent_tab_restore_service_unittest.cc
@@ -36,8 +36,8 @@
#include "content/public/test/web_contents_tester.h"
#include "testing/gtest/include/gtest/gtest.h"
-typedef TabRestoreService::Tab Tab;
-typedef TabRestoreService::Window Window;
+typedef sessions::TabRestoreService::Tab Tab;
+typedef sessions::TabRestoreService::Window Window;
using content::NavigationEntry;
using content::WebContentsTester;
@@ -46,7 +46,8 @@ using sessions::SerializedNavigationEntryTestHelper;
// Create subclass that overrides TimeNow so that we can control the time used
// for closed tabs and windows.
-class PersistentTabRestoreTimeFactory : public TabRestoreService::TimeFactory {
+class PersistentTabRestoreTimeFactory
+ : public sessions::TabRestoreService::TimeFactory {
public:
PersistentTabRestoreTimeFactory() : time_(base::Time::Now()) {}
@@ -74,7 +75,7 @@ class PersistentTabRestoreServiceTest : public ChromeRenderViewHostTestHarness {
protected:
enum {
- kMaxEntries = TabRestoreServiceHelper::kMaxEntries,
+ kMaxEntries = sessions::TabRestoreServiceHelper::kMaxEntries,
};
// testing::Test:
@@ -82,7 +83,7 @@ class PersistentTabRestoreServiceTest : public ChromeRenderViewHostTestHarness {
ChromeRenderViewHostTestHarness::SetUp();
live_tab_ = make_scoped_ptr(new sessions::ContentLiveTab(web_contents()));
time_factory_ = new PersistentTabRestoreTimeFactory();
- service_.reset(new PersistentTabRestoreService(
+ service_.reset(new sessions::PersistentTabRestoreService(
make_scoped_ptr(new ChromeTabRestoreServiceClient(profile())),
time_factory_));
}
@@ -94,7 +95,7 @@ class PersistentTabRestoreServiceTest : public ChromeRenderViewHostTestHarness {
ChromeRenderViewHostTestHarness::TearDown();
}
- TabRestoreService::Entries* mutable_entries() {
+ sessions::TabRestoreService::Entries* mutable_entries() {
return service_->mutable_entries();
}
@@ -122,7 +123,7 @@ class PersistentTabRestoreServiceTest : public ChromeRenderViewHostTestHarness {
service_->Shutdown();
content::RunAllBlockingPoolTasksUntilIdle();
service_.reset();
- service_.reset(new PersistentTabRestoreService(
+ service_.reset(new sessions::PersistentTabRestoreService(
make_scoped_ptr(new ChromeTabRestoreServiceClient(profile())),
time_factory_));
SynchronousLoadTabsFromLastSession();
@@ -176,13 +177,14 @@ class PersistentTabRestoreServiceTest : public ChromeRenderViewHostTestHarness {
GURL url3_;
std::string user_agent_override_;
scoped_ptr<sessions::LiveTab> live_tab_;
- scoped_ptr<PersistentTabRestoreService> service_;
+ scoped_ptr<sessions::PersistentTabRestoreService> service_;
PersistentTabRestoreTimeFactory* time_factory_;
};
namespace {
-class TestTabRestoreServiceObserver : public TabRestoreServiceObserver {
+class TestTabRestoreServiceObserver
+ : public sessions::TabRestoreServiceObserver {
public:
TestTabRestoreServiceObserver() : got_loaded_(false) {}
@@ -190,9 +192,11 @@ class TestTabRestoreServiceObserver : public TabRestoreServiceObserver {
bool got_loaded() const { return got_loaded_; }
// TabRestoreServiceObserver:
- void TabRestoreServiceChanged(TabRestoreService* service) override {}
- void TabRestoreServiceDestroyed(TabRestoreService* service) override {}
- void TabRestoreServiceLoaded(TabRestoreService* service) override {
+ void TabRestoreServiceChanged(sessions::TabRestoreService* service) override {
+ }
+ void TabRestoreServiceDestroyed(
+ sessions::TabRestoreService* service) override {}
+ void TabRestoreServiceLoaded(sessions::TabRestoreService* service) override {
got_loaded_ = true;
}
@@ -215,8 +219,8 @@ TEST_F(PersistentTabRestoreServiceTest, Basic) {
ASSERT_EQ(1U, service_->entries().size());
// Make sure the entry matches.
- TabRestoreService::Entry* entry = service_->entries().front();
- ASSERT_EQ(TabRestoreService::TAB, entry->type);
+ sessions::TabRestoreService::Entry* entry = service_->entries().front();
+ ASSERT_EQ(sessions::TabRestoreService::TAB, entry->type);
Tab* tab = static_cast<Tab*>(entry);
EXPECT_FALSE(tab->pinned);
EXPECT_TRUE(tab->extension_app_id.empty());
@@ -240,7 +244,7 @@ TEST_F(PersistentTabRestoreServiceTest, Basic) {
// Make sure the entry matches.
entry = service_->entries().front();
- ASSERT_EQ(TabRestoreService::TAB, entry->type);
+ ASSERT_EQ(sessions::TabRestoreService::TAB, entry->type);
tab = static_cast<Tab*>(entry);
EXPECT_FALSE(tab->pinned);
ASSERT_EQ(3U, tab->navigations.size());
@@ -274,8 +278,9 @@ TEST_F(PersistentTabRestoreServiceTest, Restore) {
ASSERT_EQ(1U, service_->entries().size());
// And verify the entry.
- PersistentTabRestoreService::Entry* entry = service_->entries().front();
- ASSERT_EQ(TabRestoreService::TAB, entry->type);
+ sessions::PersistentTabRestoreService::Entry* entry =
+ service_->entries().front();
+ ASSERT_EQ(sessions::TabRestoreService::TAB, entry->type);
Tab* tab = static_cast<Tab*>(entry);
EXPECT_FALSE(tab->pinned);
ASSERT_EQ(3U, tab->navigations.size());
@@ -299,8 +304,8 @@ TEST_F(PersistentTabRestoreServiceTest, RestorePinnedAndApp) {
// 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);
+ sessions::TabRestoreService::Entry* entry = service_->entries().front();
+ ASSERT_EQ(sessions::TabRestoreService::TAB, entry->type);
Tab* tab = static_cast<Tab*>(entry);
tab->pinned = true;
const std::string extension_app_id("test");
@@ -314,7 +319,7 @@ TEST_F(PersistentTabRestoreServiceTest, RestorePinnedAndApp) {
// And verify the entry.
entry = service_->entries().front();
- ASSERT_EQ(TabRestoreService::TAB, entry->type);
+ ASSERT_EQ(sessions::TabRestoreService::TAB, entry->type);
tab = static_cast<Tab*>(entry);
EXPECT_TRUE(tab->pinned);
ASSERT_EQ(3U, tab->navigations.size());
@@ -342,8 +347,9 @@ TEST_F(PersistentTabRestoreServiceTest, DontPersistPostData) {
// 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 sessions::TabRestoreService::Entry* restored_entry =
+ service_->entries().front();
+ ASSERT_EQ(sessions::TabRestoreService::TAB, restored_entry->type);
const Tab* restored_tab =
static_cast<const Tab*>(restored_entry);
@@ -389,10 +395,10 @@ TEST_F(PersistentTabRestoreServiceTest, LoadPreviousSession) {
// 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);
+ sessions::TabRestoreService::Entry* entry2 = service_->entries().front();
+ 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);
@@ -448,10 +454,10 @@ TEST_F(PersistentTabRestoreServiceTest, LoadPreviousSessionAndTabs) {
// 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 =
- static_cast<TabRestoreService::Window*>(entry);
+ sessions::TabRestoreService::Entry* entry = service_->entries().front();
+ 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());
@@ -462,7 +468,7 @@ TEST_F(PersistentTabRestoreServiceTest, LoadPreviousSessionAndTabs) {
// Then the closed tab.
entry = *(++service_->entries().begin());
- ASSERT_EQ(TabRestoreService::TAB, entry->type);
+ ASSERT_EQ(sessions::TabRestoreService::TAB, entry->type);
Tab* tab = static_cast<Tab*>(entry);
ASSERT_FALSE(tab->pinned);
ASSERT_EQ(3U, tab->navigations.size());
@@ -491,10 +497,10 @@ TEST_F(PersistentTabRestoreServiceTest, LoadPreviousSessionAndTabsPinned) {
// 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 =
- static_cast<TabRestoreService::Window*>(entry);
+ sessions::TabRestoreService::Entry* entry = service_->entries().front();
+ 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);
@@ -504,7 +510,7 @@ TEST_F(PersistentTabRestoreServiceTest, LoadPreviousSessionAndTabsPinned) {
// Then the closed tab.
entry = *(++service_->entries().begin());
- ASSERT_EQ(TabRestoreService::TAB, entry->type);
+ ASSERT_EQ(sessions::TabRestoreService::TAB, entry->type);
Tab* tab = static_cast<Tab*>(entry);
ASSERT_FALSE(tab->pinned);
ASSERT_EQ(3U, tab->navigations.size());
@@ -536,10 +542,10 @@ TEST_F(PersistentTabRestoreServiceTest, ManyWindowsInSessionService) {
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);
+ sessions::TabRestoreService::Entry* entry = service_->entries().front();
+ 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());
@@ -565,8 +571,8 @@ TEST_F(PersistentTabRestoreServiceTest, TimestampSurvivesRestore) {
std::vector<SerializedNavigationEntry> old_navigations;
{
// |entry|/|tab| doesn't survive after RecreateService().
- TabRestoreService::Entry* entry = service_->entries().front();
- ASSERT_EQ(TabRestoreService::TAB, entry->type);
+ sessions::TabRestoreService::Entry* entry = service_->entries().front();
+ ASSERT_EQ(sessions::TabRestoreService::TAB, entry->type);
Tab* tab = static_cast<Tab*>(entry);
tab->timestamp = tab_timestamp;
old_navigations = tab->navigations;
@@ -586,8 +592,9 @@ TEST_F(PersistentTabRestoreServiceTest, TimestampSurvivesRestore) {
ASSERT_EQ(1U, service_->entries().size());
// And verify the entry.
- TabRestoreService::Entry* restored_entry = service_->entries().front();
- ASSERT_EQ(TabRestoreService::TAB, restored_entry->type);
+ sessions::TabRestoreService::Entry* restored_entry =
+ service_->entries().front();
+ ASSERT_EQ(sessions::TabRestoreService::TAB, restored_entry->type);
Tab* restored_tab =
static_cast<Tab*>(restored_entry);
EXPECT_EQ(tab_timestamp.ToInternalValue(),
@@ -613,8 +620,8 @@ TEST_F(PersistentTabRestoreServiceTest, StatusCodesSurviveRestore) {
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);
+ sessions::TabRestoreService::Entry* entry = service_->entries().front();
+ ASSERT_EQ(sessions::TabRestoreService::TAB, entry->type);
Tab* tab = static_cast<Tab*>(entry);
old_navigations = tab->navigations;
}
@@ -633,8 +640,9 @@ TEST_F(PersistentTabRestoreServiceTest, StatusCodesSurviveRestore) {
ASSERT_EQ(1U, service_->entries().size());
// And verify the entry.
- TabRestoreService::Entry* restored_entry = service_->entries().front();
- ASSERT_EQ(TabRestoreService::TAB, restored_entry->type);
+ sessions::TabRestoreService::Entry* restored_entry =
+ service_->entries().front();
+ 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());
« no previous file with comments | « chrome/browser/sessions/persistent_tab_restore_service_browsertest.cc ('k') | chrome/browser/sessions/session_restore_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698