Store distilled URL during distillation in Reading List on iOS

ios/chrome/browser/reading_list/url_downloader.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 "ios/chrome/browser/reading_list/url_downloader.h"
 
 #include <string>
 #include <vector>
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/memory/ptr_util.h"
 #include "base/path_service.h"
 #include "components/reading_list/ios/offline_url_utils.h"
 #include "ios/chrome/browser/chrome_paths.h"
 #include "ios/chrome/browser/dom_distiller/distiller_viewer.h"
+#include "ios/chrome/browser/reading_list/reading_list_distiller_page.h"
 #include "ios/chrome/browser/reading_list/reading_list_distiller_page_factory.h"
 #include "ios/web/public/web_thread.h"
 #include "net/base/escape.h"
 #include "url/gurl.h"
 
 namespace {
 // This script disables context menu on img elements.
 // The pages are stored locally and long pressing on them will trigger a context
 // menu on the file:// URL which cannot be opened. Disable the context menu.
 const char kDisableImageContextMenuScript[] =
@@ skipping 60 matching lines @@
 }
 
 void URLDownloader::DownloadCompletionHandler(const GURL& url,
                                               const std::string& title,
                                               SuccessState success) {
   DCHECK(working_);
 
   auto post_delete = base::Bind(
       [](URLDownloader* _this, const GURL& url, const std::string& title,
          SuccessState success) {
-        _this->download_completion_.Run(
-            url, success, reading_list::OfflinePagePath(url), title);
+        _this->download_completion_.Run(url, _this->distilled_url_, success,
+                                        reading_list::OfflinePagePath(url),
+                                        title);
         _this->distiller_.reset();
         _this->working_ = false;
         _this->HandleNextTask();
       },
       base::Unretained(this), url, title, success);
 
   // If downloading failed, clean up any partial download.
   if (success == ERROR_RETRY || success == ERROR_PERMANENT) {
     task_tracker_.PostTaskAndReply(
         web::WebThread::GetTaskRunnerForThread(web::WebThread::FILE).get(),
@@ skipping 41 matching lines @@
                                      base::Unretained(this), url));
   }
 }
 
 void URLDownloader::DownloadURL(GURL url, bool offline_url_exists) {
   if (offline_url_exists) {
     DownloadCompletionHandler(url, std::string(), DOWNLOAD_EXISTS);
     return;
   }
 
+  original_url_ = url;
+  distilled_url_ = url;
+  std::unique_ptr<reading_list::ReadingListDistillerPage>
+      reading_list_distiller_page =
+          distiller_page_factory_->CreateReadingListDistillerPage();
+  reading_list_distiller_page->SetRedirectionCallback(
+      base::Bind(&URLDownloader::RedirectionCallback, base::Unretained(this)));
+
   distiller_.reset(new dom_distiller::DistillerViewer(
       distiller_service_, pref_service_, url,
       base::Bind(&URLDownloader::DistillerCallback, base::Unretained(this)),
-      distiller_page_factory_));
+      std::move(reading_list_distiller_page)));
+}
+
+void URLDownloader::RedirectionCallback(const GURL& page_url,
+                                        const GURL& redirected_url) {
+  DCHECK(original_url_ == page_url);
+  distilled_url_ = redirected_url;
 }
 
 void URLDownloader::DistillerCallback(
     const GURL& page_url,
     const std::string& html,
     const std::vector<dom_distiller::DistillerViewerInterface::ImageInfo>&
         images,
     const std::string& title) {
   if (html.empty()) {
     DownloadCompletionHandler(page_url, std::string(), ERROR_RETRY);
@@ skipping 82 matching lines @@
 }
 
 bool URLDownloader::SaveHTMLForURL(std::string html, const GURL& url) {
   if (html.empty()) {
     return false;
   }
   base::FilePath path =
       reading_list::OfflinePageAbsolutePath(base_directory_, url);
   return base::WriteFile(path, html.c_str(), html.length()) > 0;
 }