Store original request URL in offline page metadata table

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"
@@ skipping 43 matching lines @@
     : public testing::Test,
       public OfflinePageTestArchiver::Observer,
       public base::SupportsWeakPtr<OfflinePageUtilsTest> {
  public:
   OfflinePageUtilsTest();
   ~OfflinePageUtilsTest() override;
 
   void SetUp() override;
   void RunUntilIdle();
 
+  void SavePage(const GURL& url,
+                const ClientId& client_id,
+                std::unique_ptr<OfflinePageArchiver> archiver);
+
   // Necessary callbacks for the offline page model.
   void OnSavePageDone(SavePageResult result, int64_t offlineId);
   void OnClearAllDone();
   void OnExpirePageDone(bool success);
   void OnGetURLDone(const GURL& url);
 
   // OfflinePageTestArchiver::Observer implementation:
   void SetLastPathCreatedByArchiver(const base::FilePath& file_path) override;
 
   TestingProfile* profile() { return &profile_; }
@@ skipping 30 matching lines @@
 
   // Make sure the store contains the right offline pages before the load
   // happens.
   CreateOfflinePages();
 }
 
 void OfflinePageUtilsTest::RunUntilIdle() {
   base::RunLoop().RunUntilIdle();
 }
 
+void OfflinePageUtilsTest::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(&OfflinePageUtilsTest::OnSavePageDone, AsWeakPtr()));
+  RunUntilIdle();
+}
+
 void OfflinePageUtilsTest::OnSavePageDone(SavePageResult result,
                                           int64_t offline_id) {
   offline_id_ = offline_id;
 }
 
 void OfflinePageUtilsTest::OnExpirePageDone(bool success) {
   // Result ignored here.
 }
 
 void OfflinePageUtilsTest::OnClearAllDone() {
@@ skipping 10 matching lines @@
 void OfflinePageUtilsTest::CreateOfflinePages() {
   OfflinePageModel* model =
       OfflinePageModelFactory::GetForBrowserContext(profile());
 
   // Create page 1.
   std::unique_ptr<OfflinePageTestArchiver> archiver(BuildArchiver(
       kTestPage1Url, base::FilePath(FILE_PATH_LITERAL("page1.mhtml"))));
   offline_pages::ClientId client_id;
   client_id.name_space = kDownloadNamespace;
   client_id.id = kTestPage1ClientId;
-  model->SavePage(
-      kTestPage1Url, client_id, 0l, std::move(archiver),
-      base::Bind(&OfflinePageUtilsTest::OnSavePageDone, AsWeakPtr()));
-  RunUntilIdle();
+  SavePage(kTestPage1Url, client_id, std::move(archiver));
 
   // Create page 2.
   archiver = BuildArchiver(kTestPage2Url,
                            base::FilePath(FILE_PATH_LITERAL("page2.mhtml")));
   client_id.id = kTestPage2ClientId;
-  model->SavePage(
-      kTestPage2Url, client_id, 0l, std::move(archiver),
-      base::Bind(&OfflinePageUtilsTest::OnSavePageDone, AsWeakPtr()));
-  RunUntilIdle();
+  SavePage(kTestPage2Url, client_id, std::move(archiver));
 
   // Create page 4 - expired page.
   archiver = BuildArchiver(kTestPage4Url,
                            base::FilePath(FILE_PATH_LITERAL("page4.mhtml")));
   client_id.id = kTestPage4ClientId;
-  model->SavePage(
-      kTestPage4Url, client_id, 0l, std::move(archiver),
-      base::Bind(&OfflinePageUtilsTest::OnSavePageDone, AsWeakPtr()));
+  SavePage(kTestPage4Url, client_id, std::move(archiver));
   RunUntilIdle();
   model->ExpirePages(
       std::vector<int64_t>({offline_id()}), base::Time::Now(),
       base::Bind(&OfflinePageUtilsTest::OnExpirePageDone, AsWeakPtr()));
   RunUntilIdle();
 }
 
 std::unique_ptr<OfflinePageTestArchiver> OfflinePageUtilsTest::BuildArchiver(
     const GURL& url,
     const base::FilePath& file_name) {
@@ skipping 14 matching lines @@
   EXPECT_TRUE(page_exists);
   // This one should be missing
   OfflinePageUtils::CheckExistenceOfPagesWithURL(
       profile(), kDownloadNamespace, kTestPage3Url,
       base::Bind(&BoolCallback, base::Unretained(&page_exists)));
   RunUntilIdle();
   EXPECT_FALSE(page_exists);
 }
 
 }  // namespace offline_pages