[Offline pages] Extracting callbacks from the Offline Page Model

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 10 matching lines @@
 #include "base/test/test_mock_time_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "components/offline_pages/client_policy_controller.h"
 #include "components/offline_pages/offline_page_client_policy.h"
 #include "components/offline_pages/offline_page_feature.h"
 #include "components/offline_pages/offline_page_item.h"
 #include "components/offline_pages/offline_page_storage_manager.h"
 #include "components/offline_pages/offline_page_test_archiver.h"
 #include "components/offline_pages/offline_page_test_store.h"
+#include "components/offline_pages/offline_page_types.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
-using SavePageResult = offline_pages::OfflinePageModel::SavePageResult;
-using DeletePageResult = offline_pages::OfflinePageModel::DeletePageResult;
-using SingleOfflinePageItemResult =
-    offline_pages::OfflinePageModel::SingleOfflinePageItemResult;
-using MultipleOfflinePageItemResult =
-    offline_pages::OfflinePageModel::MultipleOfflinePageItemResult;
-using CheckPagesExistOfflineResult =
-    offline_pages::OfflinePageModel::CheckPagesExistOfflineResult;
-using MultipleOfflineIdResult =
-    offline_pages::OfflinePageModel::MultipleOfflineIdResult;
-
 namespace offline_pages {
 
 namespace {
 const char kTestClientNamespace[] = "CLIENT_NAMESPACE";
 const GURL kTestUrl("http://example.com");
 const GURL kTestUrl2("http://other.page.com");
 const GURL kTestUrl3("http://test.xyz");
 const GURL kFileUrl("file:///foo");
 const ClientId kTestClientId1(kTestClientNamespace, "1234");
 const ClientId kTestClientId2(kTestClientNamespace, "5678");
@@ skipping 68 matching lines @@
 
   MultipleOfflinePageItemResult GetAllPages();
 
   void SavePage(const GURL& url, ClientId client_id);
 
   void SavePageWithArchiverResult(const GURL& url,
                                   ClientId client_id,
                                   OfflinePageArchiver::ArchiverResult result);
 
   void DeletePage(int64_t offline_id,
-                  const OfflinePageModel::DeletePageCallback& callback) {
+                  const DeletePageCallback& callback) {
     std::vector<int64_t> offline_ids;
     offline_ids.push_back(offline_id);
     model()->DeletePagesByOfflineId(offline_ids, callback);
   }
 
   bool HasPages(std::string name_space);
 
   CheckPagesExistOfflineResult CheckPagesExistOffline(std::set<GURL>);
 
   MultipleOfflineIdResult GetOfflineIdsForClientId(const ClientId& client_id);
@@ skipping 82 matching lines @@
                                               const ClientId& client_id) {
   last_deleted_offline_id_ = offline_id;
   last_deleted_client_id_ = client_id;
 }
 
 void OfflinePageModelTest::SetLastPathCreatedByArchiver(
     const base::FilePath& file_path) {
   last_archiver_path_ = file_path;
 }
 
-void OfflinePageModelTest::OnSavePageDone(
-    OfflinePageModel::SavePageResult result,
-    int64_t offline_id) {
+void OfflinePageModelTest::OnSavePageDone(SavePageResult result,
+                                          int64_t offline_id) {
   last_save_result_ = result;
   last_save_offline_id_ = offline_id;
 }
 
 void OfflinePageModelTest::OnDeletePageDone(DeletePageResult result) {
   last_delete_result_ = result;
 }
 
 void OfflinePageModelTest::OnHasPagesDone(bool result) {
   last_has_pages_result_ = result;
@@ skipping 787 matching lines @@
   std::unique_ptr<base::FeatureList> feature_list2(new base::FeatureList);
   feature_list2->InitializeFromCommandLine(
       std::string(offline_pages::kOfflineBookmarksFeature.name) + "," +
           offline_pages::kOfflinePagesBackgroundLoadingFeature.name,
       "");
   base::FeatureList::SetInstance(std::move(feature_list2));
   EXPECT_TRUE(offline_pages::IsOfflinePagesBackgroundLoadingEnabled());
 }
 
 }  // namespace offline_pages