| 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 42d18850ea6b74c2dbeb7dec667938c5d1231a37..6716ff7880a3373c29879089090a32b6d76749d2 100644
|
| --- a/chrome/browser/android/offline_pages/recent_tab_helper_unittest.cc
|
| +++ b/chrome/browser/android/offline_pages/recent_tab_helper_unittest.cc
|
| @@ -80,13 +80,14 @@ class RecentTabHelperTest
|
| return task_runner_;
|
| }
|
|
|
| - size_t model_changed_count() { return model_changed_count_; }
|
| + size_t page_added_count() { return page_added_count_; }
|
| size_t model_removed_count() { return model_removed_count_; }
|
|
|
| // OfflinePageModel::Observer
|
| void OfflinePageModelLoaded(OfflinePageModel* model) override { }
|
| - void OfflinePageModelChanged(OfflinePageModel* model) override {
|
| - model_changed_count_++;
|
| + void OfflinePageAdded(OfflinePageModel* model,
|
| + const OfflinePageItem& added_page) override {
|
| + page_added_count_++;
|
| }
|
| void OfflinePageDeleted(int64_t, const offline_pages::ClientId&) override {
|
| model_removed_count_++;
|
| @@ -100,7 +101,7 @@ class RecentTabHelperTest
|
|
|
| RecentTabHelper* recent_tab_helper_; // Owned by WebContents.
|
| OfflinePageModel* model_; // Keyed service
|
| - size_t model_changed_count_;
|
| + size_t page_added_count_;
|
| size_t model_removed_count_;
|
| std::vector<OfflinePageItem> all_pages_;
|
| scoped_refptr<base::TestMockTimeTaskRunner> task_runner_;
|
| @@ -145,11 +146,10 @@ bool TestDelegate::GetTabId(content::WebContents* web_contents, int* tab_id) {
|
| RecentTabHelperTest::RecentTabHelperTest()
|
| : recent_tab_helper_(nullptr),
|
| model_(nullptr),
|
| - model_changed_count_(0),
|
| + page_added_count_(0),
|
| model_removed_count_(0),
|
| task_runner_(new base::TestMockTimeTaskRunner),
|
| - weak_ptr_factory_(this) {
|
| -}
|
| + weak_ptr_factory_(this) {}
|
|
|
| void RecentTabHelperTest::SetUp() {
|
| content::RenderViewHostTestHarness::SetUp();
|
| @@ -242,11 +242,11 @@ TEST_F(RecentTabHelperTest, TwoCapturesSameUrl) {
|
| recent_tab_helper()->DocumentAvailableInMainFrame();
|
| RunUntilIdle();
|
| EXPECT_TRUE(model()->is_loaded());
|
| - EXPECT_EQ(0U, model_changed_count());
|
| + EXPECT_EQ(0U, page_added_count());
|
| // Move the snapshot controller's time forward so it gets past timeouts.
|
| FastForwardSnapshotController();
|
| RunUntilIdle();
|
| - EXPECT_EQ(1U, model_changed_count());
|
| + EXPECT_EQ(1U, page_added_count());
|
| EXPECT_EQ(0U, model_removed_count());
|
| GetAllPages();
|
| EXPECT_EQ(1U, all_pages().size());
|
| @@ -257,7 +257,7 @@ TEST_F(RecentTabHelperTest, TwoCapturesSameUrl) {
|
| // Move the snapshot controller's time forward so it gets past timeouts.
|
| FastForwardSnapshotController();
|
| RunUntilIdle();
|
| - EXPECT_EQ(2U, model_changed_count());
|
| + EXPECT_EQ(2U, page_added_count());
|
| EXPECT_EQ(1U, model_removed_count());
|
| // the same page should be simply overridden.
|
| GetAllPages();
|
| @@ -272,11 +272,11 @@ TEST_F(RecentTabHelperTest, TwoCapturesDifferentUrls) {
|
| recent_tab_helper()->DocumentAvailableInMainFrame();
|
| RunUntilIdle();
|
| EXPECT_TRUE(model()->is_loaded());
|
| - EXPECT_EQ(0U, model_changed_count());
|
| + EXPECT_EQ(0U, page_added_count());
|
| // Move the snapshot controller's time forward so it gets past timeouts.
|
| FastForwardSnapshotController();
|
| RunUntilIdle();
|
| - EXPECT_EQ(1U, model_changed_count());
|
| + EXPECT_EQ(1U, page_added_count());
|
| EXPECT_EQ(0U, model_removed_count());
|
| GetAllPages();
|
| EXPECT_EQ(1U, all_pages().size());
|
| @@ -288,7 +288,7 @@ TEST_F(RecentTabHelperTest, TwoCapturesDifferentUrls) {
|
| // Move the snapshot controller's time forward so it gets past timeouts.
|
| FastForwardSnapshotController();
|
| RunUntilIdle();
|
| - EXPECT_EQ(2U, model_changed_count());
|
| + EXPECT_EQ(2U, page_added_count());
|
| EXPECT_EQ(1U, model_removed_count());
|
| // the same page should be simply overridden.
|
| GetAllPages();
|
|
|