Store distilled URL during distillation in Reading List on iOS

ios/chrome/browser/reading_list/url_downloader_unittest.mm

 // 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 <vector>
 
 #include "base/files/file_util.h"
 #import "base/mac/bind_objc_block.h"
@@ skipping 68 matching lines @@
     if (offlineURLExists) {
       DownloadCompletionHandler(url, std::string(), DOWNLOAD_EXISTS);
       return;
     }
     distiller_.reset(new DistillerViewerTest(
         url,
         base::Bind(&URLDownloader::DistillerCallback, base::Unretained(this))));
   }
 
   void OnEndDownload(const GURL& url,
+                     const GURL& distilled_url,
                      SuccessState success,
                      const base::FilePath& distilled_path,
                      const std::string& title) {
     downloaded_files_.push_back(url);
   }
 
   void OnEndRemove(const GURL& url, bool success) {
     removed_files_.push_back(url);
   }
 };
@@ skipping 15 matching lines @@
     downloader_->RemoveOfflineFilesDirectory();
     downloader_->ClearCompletionTrackers();
   }
 
   void WaitUntilCondition(ConditionBlock condition) {
     base::test::ios::WaitUntilCondition(condition, true,
                                         base::TimeDelta::FromSeconds(1));
   }
 };
 
 TEST_F(URLDownloaderTest, SingleDownload) {

[gambard, 2017/01/20 14:15:14]

Maybe you can add to this test the redirection url?

[Olivier, 2017/01/20 15:31:16]

Not easy because all the calls here are synchronous and the call to the
distillation callback has to be done  during the task.
I will study how to do it.

   GURL url = GURL("http://test.com");
   ASSERT_FALSE(downloader_->CheckExistenceOfOfflineURLPagePath(url));
   ASSERT_EQ(0ul, downloader_->downloaded_files_.size());
   ASSERT_EQ(0ul, downloader_->removed_files_.size());
 
   downloader_->DownloadOfflineURL(url);
 
   WaitUntilCondition(^bool {
     return std::find(downloader_->downloaded_files_.begin(),
                      downloader_->downloaded_files_.end(),
@@ skipping 49 matching lines @@
   ASSERT_TRUE(std::find(downloader_->downloaded_files_.begin(),
                         downloader_->downloaded_files_.end(),
                         url) != downloader_->downloaded_files_.end());
   ASSERT_TRUE(std::find(downloader_->removed_files_.begin(),
                         downloader_->removed_files_.end(),
                         url) != downloader_->removed_files_.end());
   ASSERT_TRUE(downloader_->CheckExistenceOfOfflineURLPagePath(url));
 }
 
 }  // namespace