Store distilled URL during distillation in Reading List on iOS

ios/chrome/browser/reading_list/url_downloader.h

 // 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.
 
 #ifndef IOS_CHROME_BROWSER_READING_LIST_URL_DOWNLOADER_H_
 #define IOS_CHROME_BROWSER_READING_LIST_URL_DOWNLOADER_H_
 
 #include <queue>
 
 #include "base/callback.h"
@@ skipping 30 matching lines @@
     DOWNLOAD_EXISTS,
     ERROR_RETRY,
     ERROR_PERMANENT
   };
 
   // A completion callback that takes a GURL and a bool indicating the
   // outcome and returns void.
   using SuccessCompletion = base::Callback<void(const GURL&, bool)>;
 
   // A download completion callback that takes, in order, the GURL that was
-  // downloaded, a SuccessState indicating the outcome of the download, the
-  // path to the downloaded page (relative to |OfflineRootDirectoryPath()|, and
-  // the title of the url, and returns void.
-  // The path to downloaded file  and title should not be used in case of
+  // downloaded, the GURL of the page that was downloaded after redirections, a
+  // SuccessState indicating the outcome of the download, the path to the
+  // downloaded page (relative to |OfflineRootDirectoryPath()|, and the title of
+  // the url, and returns void.
+  // The path to downloaded file and title should not be used in case of
   // failure.
   using DownloadCompletion = base::Callback<void(const GURL&,
+                                                 const GURL&,
                                                  SuccessState,
                                                  const base::FilePath&,
                                                  const std::string&)>;
 
   // Create a URL downloader with completion callbacks for downloads and
   // deletions. The completion callbacks will be called with the original url
   // and a boolean indicating success. For downloads, if distillation was
   // successful, it will also include the distilled url and extracted title.
   URLDownloader(
       dom_distiller::DomDistillerService* distiller_service,
@@ skipping 57 matching lines @@
           images,
       const std::string& html);
   // Callback for distillation completion.
   void DistillerCallback(
       const GURL& pageURL,
       const std::string& html,
       const std::vector<dom_distiller::DistillerViewerInterface::ImageInfo>&
           images,
       const std::string& title);
 
+  // A callback called if the URL passed to the distilled led to a redirection.
+  void RedirectionCallback(const GURL& page_url, const GURL& redirected_url);
+
   dom_distiller::DomDistillerService* distiller_service_;
   reading_list::ReadingListDistillerPageFactory* distiller_page_factory_;
   PrefService* pref_service_;
   const DownloadCompletion download_completion_;
   const SuccessCompletion delete_completion_;
   std::deque<Task> tasks_;
   bool working_;
   base::FilePath base_directory_;
+  GURL original_url_;
+  GURL distilled_url_;
   std::unique_ptr<dom_distiller::DistillerViewerInterface> distiller_;
   base::CancelableTaskTracker task_tracker_;
 
   DISALLOW_COPY_AND_ASSIGN(URLDownloader);
 };
 
 #endif  // IOS_CHROME_BROWSER_READING_LIST_URL_DOWNLOADER_H_