Store original request URL in offline page metadata table

chrome/browser/android/offline_pages/offline_page_request_job_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_request_job.h"
 
 #include "base/callback.h"
 #include "base/feature_list.h"
 #include "base/files/file_path.h"
 #include "base/memory/ptr_util.h"
@@ skipping 219 matching lines @@
  public:
   OfflinePageRequestJobTest();
   ~OfflinePageRequestJobTest() override {}
 
   void SetUp() override;
   void TearDown() override;
 
   void SimulateHasNetworkConnectivity(bool has_connectivity);
   void RunUntilIdle();
 
+  void SavePage(const GURL& url,
+                const ClientId& client_id,
+                std::unique_ptr<OfflinePageArchiver> archiver);
+
   void InterceptRequest(const GURL& url,
                         const std::string& method,
                         const std::string& extra_header_name,
                         const std::string& extra_header_value,
                         content::ResourceType resource_type);
 
   void ExpectAggregatedRequestResultHistogram(
       OfflinePageRequestJob::AggregatedRequestResult result);
   void ExpectAggregatedRequestResultHistogramWithCount(
       OfflinePageRequestJob::AggregatedRequestResult result, int count);
@@ skipping 93 matching lines @@
   // residing in test data directory.
   base::FilePath test_data_dir_path;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_path));
 
   // Save an offline page.
   base::FilePath archive_file_path =
       test_data_dir_path.AppendASCII("offline_pages").AppendASCII("test.mhtml");
   std::unique_ptr<TestOfflinePageArchiver> archiver(
       new TestOfflinePageArchiver(kTestUrl, archive_file_path, kTestFileSize));
 
-  model->SavePage(
-      kTestUrl, kTestClientId, 0, std::move(archiver),
-      base::Bind(&OfflinePageRequestJobTest::OnSavePageDone,
-                base::Unretained(this)));
-  RunUntilIdle();
+  SavePage(kTestUrl, kTestClientId, std::move(archiver));
 
   // Save another offline page associated with same online URL as above, but
   // pointing to different archive file.
   base::FilePath archive_file_path2 =
       test_data_dir_path.AppendASCII("offline_pages").
           AppendASCII("hello.mhtml");
   std::unique_ptr<TestOfflinePageArchiver> archiver2(
       new TestOfflinePageArchiver(
           kTestUrl, archive_file_path2, kTestFileSize2));
 
   // Make sure that the creation time of 2nd offline file is later.
   clock_.Advance(base::TimeDelta::FromMinutes(10));
 
-  model->SavePage(
-      kTestUrl, kTestClientId2, 0, std::move(archiver2),
-      base::Bind(&OfflinePageRequestJobTest::OnSavePageDone,
-                base::Unretained(this)));
-  RunUntilIdle();
+  SavePage(kTestUrl, kTestClientId2, std::move(archiver2));
 
   // Save an offline page associated with online URL that has a fragment
   // identifier.
   base::FilePath archive_file_path3 =
       test_data_dir_path.AppendASCII("offline_pages").
           AppendASCII("hello.mhtml");
   std::unique_ptr<TestOfflinePageArchiver> archiver3(
       new TestOfflinePageArchiver(
           kTestUrl3WithFragment, archive_file_path3, kTestFileSize3));
 
-  model->SavePage(
-      kTestUrl3WithFragment, kTestClientId3, 0, std::move(archiver3),
-      base::Bind(&OfflinePageRequestJobTest::OnSavePageDone,
-                base::Unretained(this)));
-  RunUntilIdle();
+  SavePage(kTestUrl3WithFragment, kTestClientId3, std::move(archiver3));
 
   // Create a context with delayed initialization.
   test_url_request_context_.reset(new net::TestURLRequestContext(true));
 
   test_previews_decider_.reset(new TestPreviewsDecider());
 
   // Install the interceptor.
   std::unique_ptr<net::URLRequestInterceptor> interceptor(
       new OfflinePageRequestInterceptor(test_previews_decider_.get()));
   std::unique_ptr<net::URLRequestJobFactoryImpl> job_factory_impl(
@@ skipping 56 matching lines @@
   histogram_tester_.ExpectUniqueSample(
       kAggregatedRequestResultHistogram, static_cast<int>(result), 1);
 }
 
 void OfflinePageRequestJobTest::ExpectAggregatedRequestResultHistogramWithCount(
     OfflinePageRequestJob::AggregatedRequestResult result, int count) {
   histogram_tester_.ExpectUniqueSample(
       kAggregatedRequestResultHistogram, static_cast<int>(result), count);
 }
 
+void OfflinePageRequestJobTest::SavePage(
+    const GURL& url,
+    const ClientId& client_id,
+    std::unique_ptr<OfflinePageArchiver> archiver) {
+  OfflinePageModel::SavePageParams save_page_params;
+  save_page_params.url = url;
+  save_page_params.client_id = client_id;
+  OfflinePageModelFactory::GetForBrowserContext(profile())->SavePage(
+      save_page_params,
+      std::move(archiver),
+      base::Bind(&OfflinePageRequestJobTest::OnSavePageDone,
+                 base::Unretained(this)));
+  RunUntilIdle();
+}
+
 void OfflinePageRequestJobTest::OnSavePageDone(SavePageResult result,
                                                int64_t offline_id) {
   ASSERT_EQ(SavePageResult::SUCCESS, result);
   if (offline_id_ == -1)
     offline_id_ = offline_id;
   else if (offline_id2_ == -1)
     offline_id2_ = offline_id;
   else if (offline_id3_ == -1)
     offline_id3_ = offline_id;
 }
@@ skipping 333 matching lines @@
   ASSERT_TRUE(offline_page_tab_helper()->GetOfflinePageForTest());
   EXPECT_EQ(offline_id3(),
             offline_page_tab_helper()->GetOfflinePageForTest()->offline_id);
   ExpectAggregatedRequestResultHistogramWithCount(
       OfflinePageRequestJob::AggregatedRequestResult::
           SHOW_OFFLINE_ON_DISCONNECTED_NETWORK, 3);
 
 }
 
 }  // namespace offline_pages