[Offline pages] Extracting callbacks from the Offline Page Model

chrome/browser/android/offline_pages/recent_tab_helper.cc

 // Copyright (c) 2016 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 "chrome/browser/android/offline_pages/recent_tab_helper.h"
 
 #include <queue>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 130 matching lines @@
   for (int count = 0; count < count_to_purge; ++count) {
     pages_to_purge.push_back(pages_queue.top()->offline_id);
     pages_queue.pop();
   }
 
   page_model_->DeletePagesByOfflineId(
       pages_to_purge, base::Bind(&RecentTabHelper::ContinueSnapshotAfterPurge,
                                  weak_ptr_factory_.GetWeakPtr()));
 }
 
-void RecentTabHelper::ContinueSnapshotAfterPurge(
-    OfflinePageModel::DeletePageResult result) {
+void RecentTabHelper::ContinueSnapshotAfterPurge(DeletePageResult result) {
   // NOT_FOUND is because it's what we get when passing empty vector of ids.
   // TODO(dimich): remove NOT_FOUND when bug 608057 is fixed.
-  if (result != OfflinePageModel::DeletePageResult::SUCCESS &&
-      result != OfflinePageModel::DeletePageResult::NOT_FOUND) {
+  if (result != DeletePageResult::SUCCESS &&
+      result != DeletePageResult::NOT_FOUND) {
     // If previous pages can't be deleted, don't add new ones.
     ReportSnapshotCompleted();
     return;
   }
 
   if (!IsSamePage()) {
     ReportSnapshotCompleted();
     return;
   }
 
   // Create either test Archiver or a regular one.
   std::unique_ptr<OfflinePageArchiver> archiver;
   if (test_archive_factory_.get()) {
     archiver = test_archive_factory_->CreateArchiver(web_contents());
   } else {
     archiver.reset(new OfflinePageMHTMLArchiver(web_contents()));
   }
 
   page_model_->SavePage(
       snapshot_url_, client_id(), std::move(archiver),
       base::Bind(&RecentTabHelper::SavePageCallback,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
-void RecentTabHelper::SavePageCallback(OfflinePageModel::SavePageResult result,
+void RecentTabHelper::SavePageCallback(SavePageResult result,
                                        int64_t offline_id) {
   // TODO(dimich): add UMA, including result. Bug 608112.
   ReportSnapshotCompleted();
 }
 
 void RecentTabHelper::ReportSnapshotCompleted() {
   snapshot_controller_->PendingSnapshotCompleted();
 }
 
 bool RecentTabHelper::IsSamePage() const {
   return web_contents() &&
          (web_contents()->GetLastCommittedURL() == snapshot_url_);
 }
 
 ClientId RecentTabHelper::client_id() const {
   return ClientId(kClientNamespace, "");
 }
 
 void RecentTabHelper::SetArchiveFactoryForTest(
     std::unique_ptr<TestArchiveFactory> test_archive_factory) {
   test_archive_factory_ = std::move(test_archive_factory);
 }
 
 void RecentTabHelper::SetTaskRunnerForTest(
     const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) {
   snapshot_controller_.reset(new SnapshotController(task_runner, this));
 }
 
 }  // namespace offline_pages