Use Distilled path instead of DistilledURL.

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 27 matching lines @@
     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
-  // offline GURL for the download, and the title of the url, and returns void.
-  // The offline GURL and title should not be used in case of failure.
-  using DownloadCompletion = base::Callback<
-      void(const GURL&, SuccessState, const GURL&, const std::string&)>;
+  // 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&,
+                                                 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,
                 PrefService* prefs,
                 base::FilePath chrome_profile_path,
                 const DownloadCompletion& download_completion,
                 const SuccessCompletion& delete_completion);
@@ skipping 14 matching lines @@
   // Handles the next task in the queue, if no task is currently being handled.
   void HandleNextTask();
   // Callback for completed (or failed) download, handles calling
   // downloadCompletion and starting the next task.
   void DownloadCompletionHandler(const GURL& url,
                                  const std::string& title,
                                  SuccessState success);
   // Callback for completed (or failed) deletion, handles calling
   // deleteCompletion and starting the next task.
   void DeleteCompletionHandler(const GURL& url, bool success);
-  // The path of the directory where offline URLs are saved.
-  base::FilePath OfflineDirectoryPath();
-  // The path of the directory where a specific URL is saved offline. Contains
-  // the page and supporting files (images).
-  base::FilePath OfflineURLDirectoryPath(const GURL& url);
-  // The path of the offline webpage for the URL. The file may not exist.
-  base::FilePath OfflineURLPagePath(const GURL& url);
+  // The absolute path of the directory where offline URLs are saved.
+  base::FilePath OfflineRootDirectoryPath();
+
+  // The absolute path of the directory where a specific URL is saved offline.
+  // Contains the page and supporting files (images).
+  base::FilePath OfflineURLDirectoryAbsolutePath(const GURL& url);
+  // The absolute path of the offline webpage for the URL. The file may not
+  // exist.
+  base::FilePath OfflinePageAbsolutePath(const GURL& url);
+  // The relative path to the distilled page. The result is relative to
+  // |OfflineRootDirectoryPath()|.
+  base::FilePath OfflinePagePath(const GURL& url);
   // Creates the offline directory for |url|. Returns true if successful or if
   // the directory already exists.
   bool CreateOfflineURLDirectory(const GURL& url);
+  // The name of the directory containing offline data for |url|.
+  std::string OfflineURLDirectoryID(const GURL& url);
+
   // Saves the |data| for image at |imageURL| to disk, for main URL |url|;
   // puts path of saved file in |path| and returns whether save was successful.
   bool SaveImage(const GURL& url,
                  const GURL& imageURL,
                  const std::string& data,
                  std::string* image_name);
   // Saves images in |images| array to disk and replaces references in |html| to
   // local path. Returns updated html.
   std::string SaveAndReplaceImagesInHTML(
       const GURL& url,
@@ skipping 25 matching lines @@
   std::deque<Task> tasks_;
   bool working_;
   base::FilePath base_directory_;
   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_