[Offline pages] Extracting callbacks from the Offline Page Model

chrome/browser/android/offline_pages/offline_page_utils_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 "chrome/browser/android/offline_pages/offline_page_utils.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/feature_list.h"
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/test/test_simple_task_runner.h"
 #include "base/thread_task_runner_handle.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/common/chrome_constants.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/offline_pages/offline_page_feature.h"
 #include "components/offline_pages/offline_page_model.h"
 #include "components/offline_pages/offline_page_test_archiver.h"
 #include "components/offline_pages/offline_page_test_store.h"
-#include "components/offline_pages/proto/offline_pages.pb.h"
+#include "components/offline_pages/offline_page_types.h"
 #include "net/base/filename_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 namespace offline_pages {
 namespace {
 
 const GURL kTestPage1Url("http://test.org/page1");
 const GURL kTestPage2Url("http://test.org/page2");
 const GURL kTestPage3Url("http://test.org/page3");
@@ skipping 10 matching lines @@
       public OfflinePageTestArchiver::Observer,
       public base::SupportsWeakPtr<OfflinePageUtilsTest> {
  public:
   OfflinePageUtilsTest();
   ~OfflinePageUtilsTest() override;
 
   void SetUp() override;
   void RunUntilIdle();
 
   // Necessary callbacks for the offline page model.
-  void OnSavePageDone(OfflinePageModel::SavePageResult result,
-                      int64_t offlineId);
+  void OnSavePageDone(SavePageResult result, int64_t offlineId);
   void OnClearAllDone();
 
   // OfflinePageTestArchiver::Observer implementation:
   void SetLastPathCreatedByArchiver(const base::FilePath& file_path) override;
 
   // Offline page URL for the first page.
   const GURL& offline_url_page_1() const { return offline_url_page_1_; }
   // Offline page URL for the second page.
   const GURL& offline_url_page_2() const { return offline_url_page_2_; }
   // Offline page URL not related to any page.
@@ skipping 42 matching lines @@
 
   // Make sure the store contains the right offline pages before the load
   // happens.
   CreateOfflinePages();
 }
 
 void OfflinePageUtilsTest::RunUntilIdle() {
   task_runner_->RunUntilIdle();
 }
 
-void OfflinePageUtilsTest::OnSavePageDone(
-    OfflinePageModel::SavePageResult result,
-    int64_t offline_id) {
+void OfflinePageUtilsTest::OnSavePageDone(SavePageResult result,
+                                          int64_t offline_id) {
   offline_id_ = offline_id;
 }
 
 void OfflinePageUtilsTest::OnClearAllDone() {
   // Result ignored here.
 }
 
 void OfflinePageUtilsTest::SetLastPathCreatedByArchiver(
     const base::FilePath& file_path) {}
 
@@ skipping 96 matching lines @@
 TEST_F(OfflinePageUtilsTest, HasOfflinePageForOnlineURL) {
   EXPECT_TRUE(
       OfflinePageUtils::HasOfflinePageForOnlineURL(profile(), kTestPage1Url));
   EXPECT_TRUE(
       OfflinePageUtils::HasOfflinePageForOnlineURL(profile(), kTestPage2Url));
   EXPECT_FALSE(
       OfflinePageUtils::HasOfflinePageForOnlineURL(profile(), kTestPage3Url));
 }
 
 }  // namespace offline_pages