Store the distilled_url in Reading List entry in Reading List on iOS.

components/reading_list/ios/reading_list_model_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 "components/reading_list/ios/reading_list_model.h"
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #import "base/test/ios/wait_util.h"
 #include "components/reading_list/ios/reading_list_model_impl.h"
@@ skipping 352 matching lines @@
   ClearCounts();
 
   model_->SyncAddEntry(std::move(entry));
   AssertObserverCount(0, 0, 0, 0, 0, 0, 1, 0, 1);
   AssertStorageCount(0, 0);
   EXPECT_EQ(0ul, UnreadSize());
   EXPECT_EQ(1ul, ReadSize());
   ClearCounts();
 }
 
 TEST_F(ReadingListModelTest, SyncMergeEntry) {

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

Maybe out of scope, but can you add comments to all the tests in this file?
It is hard to know what is tested in each function.

[Olivier, 2017/01/20 14:43:51]

Done.

   auto storage = base::MakeUnique<TestReadingListStorage>(this);
   SetStorage(std::move(storage));
   model_->AddEntry(GURL("http://example.com"), "sample",
                    reading_list::ADDED_VIA_CURRENT_APP);
-  model_->SetEntryDistilledPath(GURL("http://example.com"),
-                                base::FilePath("distilled/page.html"));
+  const base::FilePath distilled_path("distilled/page.html");
+  const GURL distilled_url("http://example.com/distilled");
+  model_->SetEntryDistilledInfo(GURL("http://example.com"), distilled_path,
+                                distilled_url);
   const ReadingListEntry* local_entry =
       model_->GetEntryByURL(GURL("http://example.com"));
   int64_t local_update_time = local_entry->UpdateTime();
 
   base::test::ios::SpinRunLoopWithMinDelay(
       base::TimeDelta::FromMilliseconds(10));
   auto sync_entry =
       base::MakeUnique<ReadingListEntry>(GURL("http://example.com"), "sample");
   sync_entry->SetRead(true);
   ASSERT_GT(sync_entry->UpdateTime(), local_update_time);
@@ skipping 208 matching lines @@
   AssertObserverCount(0, 0, 0, 0, 0, 0, 0, 1, 1);
   EXPECT_EQ(ReadingListEntry::PROCESSING, entry.DistilledState());
 }
 
 TEST_F(ReadingListModelTest, UpdateDistilledPath) {
   const GURL gurl("http://example.com");
   const ReadingListEntry& entry =
       model_->AddEntry(gurl, "sample", reading_list::ADDED_VIA_CURRENT_APP);
   ClearCounts();
 
-  model_->SetEntryDistilledPath(gurl, base::FilePath("distilled/page.html"));
+  const base::FilePath distilled_path("distilled/page.html");
+  const GURL distilled_url("http://example.com/distilled");
+  model_->SetEntryDistilledInfo(GURL("http://example.com"), distilled_path,
+                                distilled_url);
   AssertObserverCount(0, 0, 0, 0, 0, 0, 0, 1, 1);
   EXPECT_EQ(ReadingListEntry::PROCESSED, entry.DistilledState());
   EXPECT_EQ(base::FilePath("distilled/page.html"), entry.DistilledPath());

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

Add test for the distilled url.

[Olivier, 2017/01/20 14:43:51]

Done.

 }
 
 TEST_F(ReadingListModelTest, UpdateReadEntryTitle) {
   const GURL gurl("http://example.com");
   model_->AddEntry(gurl, "sample", reading_list::ADDED_VIA_CURRENT_APP);
   model_->SetReadStatus(gurl, true);
   const ReadingListEntry* entry = model_->GetEntryByURL(gurl);
   ClearCounts();
 
   model_->SetEntryTitle(gurl, "ping");
@@ skipping 13 matching lines @@
   EXPECT_EQ(ReadingListEntry::PROCESSING, entry->DistilledState());
 }
 
 TEST_F(ReadingListModelTest, UpdateReadDistilledPath) {
   const GURL gurl("http://example.com");
   model_->AddEntry(gurl, "sample", reading_list::ADDED_VIA_CURRENT_APP);
   model_->SetReadStatus(gurl, true);
   const ReadingListEntry* entry = model_->GetEntryByURL(gurl);
   ClearCounts();
 
-  model_->SetEntryDistilledPath(gurl, base::FilePath("distilled/page.html"));
+  const base::FilePath distilled_path("distilled/page.html");
+  const GURL distilled_url("http://example.com/distilled");
+  model_->SetEntryDistilledInfo(GURL("http://example.com"), distilled_path,
+                                distilled_url);
   AssertObserverCount(0, 0, 0, 0, 0, 0, 0, 1, 1);
   EXPECT_EQ(ReadingListEntry::PROCESSED, entry->DistilledState());
   EXPECT_EQ(base::FilePath("distilled/page.html"), entry->DistilledPath());

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

Add test for distilled url.

[Olivier, 2017/01/20 14:43:51]

Done.

 }
 
 // Tests that ReadingListModel calls CallbackModelBeingDeleted when destroyed.
 TEST_F(ReadingListModelTest, CallbackModelBeingDeleted) {
   AssertObserverCount(1, 0, 0, 0, 0, 0, 0, 0, 0);
   model_.reset();
   AssertObserverCount(1, 0, 0, 1, 0, 0, 0, 0, 0);
 }
 
 }  // namespace