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

Unified Diff: chrome/browser/android/offline_pages/recent_tab_helper_unittest.cc

Issue 2564163002: [Offline Pages] Remove load state from public OfflinePageModel API. (Closed)
Patch Set: Fix broken tests. Created 4 years 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
Index: chrome/browser/android/offline_pages/recent_tab_helper_unittest.cc
diff --git a/chrome/browser/android/offline_pages/recent_tab_helper_unittest.cc b/chrome/browser/android/offline_pages/recent_tab_helper_unittest.cc
index 922d80756a23a81039a59057ff7f2fc5ce512634..19b9f4aa5f7420f0ed3998f5a55d6ccebf62e19f 100644
--- a/chrome/browser/android/offline_pages/recent_tab_helper_unittest.cc
+++ b/chrome/browser/android/offline_pages/recent_tab_helper_unittest.cc
@@ -99,7 +99,6 @@ class RecentTabHelperTest
size_t model_removed_count() { return model_removed_count_; }
// OfflinePageModel::Observer
- void OfflinePageModelLoaded(OfflinePageModel* model) override { }
void OfflinePageAdded(OfflinePageModel* model,
const OfflinePageItem& added_page) override {
page_added_count_++;
@@ -229,7 +228,6 @@ TEST_F(RecentTabHelperTest, SimpleCapture) {
recent_tab_helper()->DocumentOnLoadCompletedInMainFrame();
FastForwardSnapshotController();
RunUntilIdle();
- EXPECT_TRUE(model()->is_loaded());
GetAllPages();
EXPECT_EQ(1U, all_pages().size());
EXPECT_EQ(kTestPageUrl, all_pages()[0].url);
@@ -245,7 +243,6 @@ TEST_F(RecentTabHelperTest, NoTabIdNoCapture) {
recent_tab_helper()->DocumentOnLoadCompletedInMainFrame();
FastForwardSnapshotController();
RunUntilIdle();
- EXPECT_TRUE(model()->is_loaded());
GetAllPages();
// No page should be captured.
EXPECT_EQ(0U, all_pages().size());
@@ -258,7 +255,6 @@ TEST_F(RecentTabHelperTest, TwoCapturesSamePageLoad) {
// Triggers snapshot after a time delay.
recent_tab_helper()->DocumentAvailableInMainFrame();
RunUntilIdle();
- EXPECT_TRUE(model()->is_loaded());
EXPECT_EQ(0U, page_added_count());
// Move the snapshot controller's time forward so it gets past timeouts.
FastForwardSnapshotController();
@@ -292,7 +288,6 @@ TEST_F(RecentTabHelperTest, TwoCapturesSamePageLoadSecondFails) {
// Triggers snapshot after a time delay.
recent_tab_helper()->DocumentAvailableInMainFrame();
RunUntilIdle();
- EXPECT_TRUE(model()->is_loaded());
EXPECT_EQ(0U, page_added_count());
// Move the snapshot controller's time forward so it gets past timeouts.
FastForwardSnapshotController();
@@ -335,7 +330,6 @@ TEST_F(RecentTabHelperTest, TwoCapturesDifferentPageLoadsSameUrl) {
// Triggers snapshot after a time delay.
recent_tab_helper()->DocumentAvailableInMainFrame();
RunUntilIdle();
- EXPECT_TRUE(model()->is_loaded());
EXPECT_EQ(0U, page_added_count());
// Move the snapshot controller's time forward so it gets past timeouts.
FastForwardSnapshotController();
@@ -370,7 +364,6 @@ TEST_F(RecentTabHelperTest, TwoCapturesDifferentPageLoadsSameUrlSecondFails) {
// Triggers snapshot after a time delay.
recent_tab_helper()->DocumentAvailableInMainFrame();
RunUntilIdle();
- EXPECT_TRUE(model()->is_loaded());
EXPECT_EQ(0U, page_added_count());
// Move the snapshot controller's time forward so it gets past timeouts.
FastForwardSnapshotController();
@@ -411,7 +404,6 @@ TEST_F(RecentTabHelperTest, TwoCapturesDifferentPageLoadsAndUrls) {
// Triggers snapshot after a time delay.
recent_tab_helper()->DocumentAvailableInMainFrame();
RunUntilIdle();
- EXPECT_TRUE(model()->is_loaded());
EXPECT_EQ(0U, page_added_count());
// Move the snapshot controller's time forward so it gets past timeouts.
FastForwardSnapshotController();
@@ -443,7 +435,6 @@ TEST_F(RecentTabHelperTest, NoCaptureOnErrorPage) {
recent_tab_helper()->DocumentOnLoadCompletedInMainFrame();
FastForwardSnapshotController();
RunUntilIdle();
- EXPECT_TRUE(model()->is_loaded());
GetAllPages();
EXPECT_EQ(0U, all_pages().size());
}
@@ -457,7 +448,6 @@ TEST_F(RecentTabHelperTest, FeatureNotEnabled) {
recent_tab_helper()->DocumentOnLoadCompletedInMainFrame();
FastForwardSnapshotController();
RunUntilIdle();
- EXPECT_TRUE(model()->is_loaded());
GetAllPages();
// No page should be captured.
EXPECT_EQ(0U, all_pages().size());
@@ -471,7 +461,6 @@ TEST_F(RecentTabHelperTest, DISABLED_DownloadRequest) {
ClientId("download", "id1"), 153l);
recent_tab_helper()->DocumentOnLoadCompletedInMainFrame();
RunUntilIdle();
- EXPECT_TRUE(model()->is_loaded());
GetAllPages();
EXPECT_EQ(1U, all_pages().size());
const OfflinePageItem& page = all_pages()[0];

Powered by Google App Engine
This is Rietveld 408576698