Makes the OfflinePageBridge.getAllPages method asynchronous.

components/offline_pages/offline_page_model_unittest.cc

 // Copyright 2015 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 "components/offline_pages/offline_page_model.h"
 
 #include <stdint.h>
 #include <algorithm>
 #include <utility>
 
@@ skipping 81 matching lines @@
   void FastForwardBy(base::TimeDelta delta);
   void ResetResults();
 
   OfflinePageTestStore* GetStore();
 
   void SavePage(const GURL& url, int64_t bookmark_id);
   void SavePageWithArchiverResult(const GURL& url,
                                   int64_t bookmark_id,
                                   OfflinePageArchiver::ArchiverResult result);
 
+  void DeletePage(int64_t bookmark_id,
+                  const OfflinePageModel::DeletePageCallback& callback) {
+    model()->DeletePagesByBookmarkId(std::vector<int64_t>(1, bookmark_id),
+                                     callback);
+  }
+
   OfflinePageModel* model() { return model_.get(); }
 
   SavePageResult last_save_result() const {
     return last_save_result_;
   }
 
   DeletePageResult last_delete_result() const {
     return last_delete_result_;
   }
 
@@ skipping 369 matching lines @@
   ResetResults();
 
   // Save another page.
   SavePage(kTestUrl2, kTestPageBookmarkId2);
   EXPECT_EQ(SavePageResult::SUCCESS, last_save_result());
   EXPECT_EQ(2u, store->GetAllPages().size());
 
   ResetResults();
 
   // Delete one page.
-  model()->DeletePageByBookmarkId(
-      kTestPageBookmarkId1, base::Bind(&OfflinePageModelTest::OnDeletePageDone,
-                                       AsWeakPtr()));
+  DeletePage(kTestPageBookmarkId1,
+             base::Bind(&OfflinePageModelTest::OnDeletePageDone, AsWeakPtr()));
 
   PumpLoop();
 
   EXPECT_EQ(last_deleted_bookmark_id(), kTestPageBookmarkId1);
   EXPECT_EQ(DeletePageResult::SUCCESS, last_delete_result());
   ASSERT_EQ(1u, store->GetAllPages().size());
   EXPECT_EQ(kTestUrl2, store->GetAllPages()[0].url);
 
   // Delete another page.
-  model()->DeletePageByBookmarkId(
-      kTestPageBookmarkId2, base::Bind(&OfflinePageModelTest::OnDeletePageDone,
-                                       AsWeakPtr()));
+  DeletePage(kTestPageBookmarkId2,
+             base::Bind(&OfflinePageModelTest::OnDeletePageDone, AsWeakPtr()));
 
   ResetResults();
 
   PumpLoop();
 
   EXPECT_EQ(last_deleted_bookmark_id(), kTestPageBookmarkId2);
   EXPECT_EQ(DeletePageResult::SUCCESS, last_delete_result());
   EXPECT_EQ(0u, store->GetAllPages().size());
 }
 
 TEST_F(OfflinePageModelTest, DeletePageNotFound) {
-  model()->DeletePageByBookmarkId(
-      kTestPageBookmarkId1, base::Bind(&OfflinePageModelTest::OnDeletePageDone,
-                                       AsWeakPtr()));
+  DeletePage(kTestPageBookmarkId1,
+             base::Bind(&OfflinePageModelTest::OnDeletePageDone, AsWeakPtr()));
   EXPECT_EQ(DeletePageResult::NOT_FOUND, last_delete_result());
 }
 
 TEST_F(OfflinePageModelTest, DeletePageStoreFailureOnRemove) {
   // Save a page.
   SavePage(kTestUrl, kTestPageBookmarkId1);
 
   ResetResults();
 
   // Try to delete this page.
   GetStore()->set_test_scenario(
       OfflinePageTestStore::TestScenario::REMOVE_FAILED);
-  model()->DeletePageByBookmarkId(
-      kTestPageBookmarkId1, base::Bind(&OfflinePageModelTest::OnDeletePageDone,
-                                       AsWeakPtr()));
+  DeletePage(kTestPageBookmarkId1,
+             base::Bind(&OfflinePageModelTest::OnDeletePageDone, AsWeakPtr()));
   PumpLoop();
   EXPECT_EQ(DeletePageResult::STORE_FAILURE, last_delete_result());
 }
 
 TEST_F(OfflinePageModelTest, DetectThatOfflineCopyIsMissing) {
   // Save a page.
   SavePage(kTestUrl, kTestPageBookmarkId1);
 
   ResetResults();
 
@@ skipping 366 matching lines @@
   PumpLoop();
   EXPECT_EQ(0UL, model()->GetAllPages().size());
 
   // The offline copy should be restored upon the bookmark restore.
   UndoBookmarkRemoval();
   PumpLoop();
   EXPECT_EQ(1UL, model()->GetAllPages().size());
 }
 
 }  // namespace offline_pages