[Offline pages] Extracting callbacks from the Offline Page Model

chrome/browser/android/offline_pages/offline_page_tab_helper_unittest.cc

 // Copyright 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/offline_page_tab_helper.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/feature_list.h"
 #include "base/files/file_path.h"
 #include "base/memory/weak_ptr.h"
 #include "base/run_loop.h"
 #include "chrome/browser/android/offline_pages/offline_page_model_factory.h"
 #include "chrome/browser/android/offline_pages/test_offline_page_model_builder.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "components/offline_pages/offline_page_feature.h"
 #include "components/offline_pages/offline_page_item.h"
 #include "components/offline_pages/offline_page_model.h"
 #include "components/offline_pages/offline_page_test_archiver.h"
+#include "components/offline_pages/offline_page_types.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "net/base/net_errors.h"
 #include "net/base/network_change_notifier.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using SavePageResult = offline_pages::OfflinePageModel::SavePageResult;
-using SingleOfflinePageItemResult =
-    offline_pages::OfflinePageModel::SingleOfflinePageItemResult;
-
 namespace offline_pages {
 
 namespace {
 
 const GURL kTestPageUrl("http://test.org/page1");
 const ClientId kTestClientId = ClientId(kBookmarkNamespace, "1234");
 const int64_t kTestFileSize = 876543LL;
 
 class TestNetworkChangeNotifier : public net::NetworkChangeNotifier {
  public:
@@ skipping 175 matching lines @@
   StartLoad(online_url());
   RunUntilIdle();
   EXPECT_EQ(online_url(), controller().GetPendingEntry()->GetURL());
 
   // Redirection will be done immediately on navigation end with error.
   FailLoad(online_url());
   EXPECT_EQ(offline_url(), controller().GetPendingEntry()->GetURL());
 }
 
 }  // namespace offline_pages