[Offline pages] Wiring delete page to the offline bridge

Changes:
* Adding delete page functionality to the offline bridge,
* Adding callback for delete page in OfflinePageCallback
* Updating the offline page model to enable deleting pages by
  bookmark ID,
* Adding appropriate tests for the bridge and model
* Changing the model to not use a weak pointer when calling
  DeleteArchiveFile, as it was causing a DCHECK in IsValid of the ptr.
  The call was replaced with a function in an anonymous namespace, to
  avoid a this pointer altogether (alternative was to pass unretained)

BUG=491352
R=jianli@chromium.org,mariakhomenko@chromium.org

Review URL: https://codereview.chromium.org/1286143008

Cr-Commit-Position: refs/heads/master@{#343117}

1 files changed, 12 insertions, 12 deletions

diff --git a/components/offline_pages/offline_page_model_unittest.cc b/components/offline_pages/offline_page_model_unittest.cc
index 3010b52..e09bfe6 100644
--- a/components/offline_pages/offline_page_model_unittest.cc
+++ b/components/offline_pages/offline_page_model_unittest.cc
@@ -527,9 +527,9 @@ TEST_F(OfflinePageModelTest, DeletePageSuccessful) {
   ResetResults();
 
   // Delete one page.
-  model()->DeletePage(kTestUrl,
-                      base::Bind(&OfflinePageModelTest::OnDeletePageDone,
-                                 AsWeakPtr()));
+  model()->DeletePageByBookmarkId(
+      kTestPageBookmarkId1, base::Bind(&OfflinePageModelTest::OnDeletePageDone,
+                                       AsWeakPtr()));
 
   PumpLoop();
 
@@ -538,9 +538,9 @@ TEST_F(OfflinePageModelTest, DeletePageSuccessful) {
   EXPECT_EQ(kTestUrl2, store->offline_pages()[0].url);
 
   // Delete another page.
-  model()->DeletePage(kTestUrl2,
-                      base::Bind(&OfflinePageModelTest::OnDeletePageDone,
-                                 AsWeakPtr()));
+  model()->DeletePageByBookmarkId(
+      kTestPageBookmarkId2, base::Bind(&OfflinePageModelTest::OnDeletePageDone,
+                                       AsWeakPtr()));
 
   ResetResults();
 
@@ -551,9 +551,9 @@ TEST_F(OfflinePageModelTest, DeletePageSuccessful) {
 }
 
 TEST_F(OfflinePageModelTest, DeletePageNotFound) {
-  model()->DeletePage(kTestUrl,
-                      base::Bind(&OfflinePageModelTest::OnDeletePageDone,
-                                 AsWeakPtr()));
+  model()->DeletePageByBookmarkId(
+      kTestPageBookmarkId1, base::Bind(&OfflinePageModelTest::OnDeletePageDone,
+                                       AsWeakPtr()));
   EXPECT_EQ(DeletePageResult::NOT_FOUND, last_delete_result());
 }
 
@@ -573,9 +573,9 @@ TEST_F(OfflinePageModelTest, DeletePageStoreFailureOnRemove) {
   // Try to delete this page.
   GetStore()->set_test_scenario(
       OfflinePageTestStore::TestScenario::REMOVE_FAILED);
-  model()->DeletePage(kTestUrl,
-                      base::Bind(&OfflinePageModelTest::OnDeletePageDone,
-                                 AsWeakPtr()));
+  model()->DeletePageByBookmarkId(
+      kTestPageBookmarkId1, base::Bind(&OfflinePageModelTest::OnDeletePageDone,
+                                       AsWeakPtr()));
   PumpLoop();
   EXPECT_EQ(DeletePageResult::STORE_FAILURE, last_delete_result());
 }