Store original request URL in offline page metadata table

components/offline_pages/offline_page_model.h

 // 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.
 
 #ifndef COMPONENTS_OFFLINE_PAGES_OFFLINE_PAGE_MODEL_H_
 #define COMPONENTS_OFFLINE_PAGES_OFFLINE_PAGE_MODEL_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 29 matching lines @@
 //
 //   // In code using the OfflinePagesModel to save a page:
 //   std::unique_ptr<ArchiverImpl> archiver(new ArchiverImpl());
 //   // Callback is of type SavePageCallback.
 //   model->SavePage(url, std::move(archiver), callback);
 //
 // TODO(fgorski): Things to describe:
 // * how to cancel requests and what to expect
 class OfflinePageModel : public base::SupportsUserData {
  public:
+  // Describes the info about the page to save.
+  struct SavePageInfo {

[fgorski, 2016/11/10 23:56:13]

How about renaming it to SavePageParams?
Why? Because the purpose of this structure is to simplify SavePage interface,
and I hope we won't use it for anything else. We already have relevant
structures for other applications:
* OfflinePageInfo
* SavePageRequest

Please, update documentation respectively.

[jianli, 2016/11/16 01:25:40]

Done.

+    SavePageInfo();
+
+    // The last committed URL of the page to save.
+    GURL url;
+
+    // The identification used by the client.
+    ClientId client_id;
+
+    // Used for the offline_id for the saved file if non-zero. If it is
+    // kInvalidOfflineId, a new, random ID will be generated.
+    int64_t proposed_offline_id;
+
+    // The original URL of the page to save. Empty if no redirect occurs.
+    GURL original_url;
+  };
+
   // Observer of the OfflinePageModel.
   class Observer {
    public:
     // Invoked when the model has finished loading.
     virtual void OfflinePageModelLoaded(OfflinePageModel* model) = 0;
 
     // Invoked when the model is being updated, due to adding, removing or
     // updating an offline page.
     virtual void OfflinePageModelChanged(OfflinePageModel* model) = 0;
 
@@ skipping 16 matching lines @@
   static bool CanSaveURL(const GURL& url);
 
   OfflinePageModel();
   ~OfflinePageModel() override;
 
   virtual void AddObserver(Observer* observer) = 0;
   virtual void RemoveObserver(Observer* observer) = 0;
 
   static const int64_t kInvalidOfflineId = 0;
 
   // Attempts to save a page addressed by |url| offline. Requires that the model

[fgorski, 2016/11/10 23:56:13]

url is not longer passed here.

[jianli, 2016/11/16 01:25:40]

Done.

-  // is loaded.  Generates a new offline id and returns
-  // it. |proposed_offline_id| is used for the offline_id for the saved file if
-  // it is non-zero.  If it is kInvalidOfflineId, a new, random ID will be
-  // generated.
-  virtual void SavePage(const GURL& url,
-                        const ClientId& client_id,
-                        int64_t proposed_offline_id,
+  // is loaded.  Generates a new offline id or uses the proposed offline id and
+  // returns it.
+  virtual void SavePage(const SavePageInfo& save_page_info,
                         std::unique_ptr<OfflinePageArchiver> archiver,
                         const SavePageCallback& callback) = 0;
 
   // Marks that the offline page related to the passed |offline_id| has been
   // accessed. Its access info, including last access time and access count,
   // will be updated. Requires that the model is loaded.
   virtual void MarkPageAccessed(int64_t offline_id) = 0;
 
   // Deletes pages based on |offline_ids|.
   virtual void DeletePagesByOfflineId(const std::vector<int64_t>& offline_ids,
@@ skipping 53 matching lines @@
   // TODO(dougarnett): Remove this and its uses.
   virtual bool is_loaded() const = 0;
 
   // Returns the logger. Ownership is retained by the model.
   virtual OfflineEventLogger* GetLogger() = 0;
 };
 
 }  // namespace offline_pages
 
 #endif  // COMPONENTS_OFFLINE_PAGES_OFFLINE_PAGE_MODEL_H_