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

components/reading_list/ios/reading_list_entry_unittest.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 "components/reading_list/ios/reading_list_entry.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/test/ios/wait_util.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "components/reading_list/ios/proto/reading_list.pb.h"
@@ skipping 57 matching lines @@
   EXPECT_GT(e.UpdateTitleTime(), e.CreationTime());
   EXPECT_EQ("foo", e.Title());
 }
 
 TEST(ReadingListEntry, DistilledPathAndURL) {
   ReadingListEntry e(GURL("http://example.com"), "bar");
 
   EXPECT_TRUE(e.DistilledPath().empty());
 
   const base::FilePath distilled_path("distilled/page.html");
-  e.SetDistilledPath(distilled_path);
+  const GURL distilled_url("http://example.com/distilled");
+  e.SetDistilledInfo(distilled_path, distilled_url);
   EXPECT_EQ(distilled_path, e.DistilledPath());
+  EXPECT_EQ(distilled_url, e.DistilledURL());
 }
 
 TEST(ReadingListEntry, DistilledState) {
   ReadingListEntry e(GURL("http://example.com"), "bar");
 
   EXPECT_EQ(ReadingListEntry::WAITING, e.DistilledState());
 
   e.SetDistilledState(ReadingListEntry::ERROR);
   EXPECT_EQ(ReadingListEntry::ERROR, e.DistilledState());
 
   const base::FilePath distilled_path("distilled/page.html");
-  e.SetDistilledPath(distilled_path);
+  const GURL distilled_url("http://example.com/distilled");
+  e.SetDistilledInfo(distilled_path, distilled_url);
   EXPECT_EQ(ReadingListEntry::PROCESSED, e.DistilledState());
 }
 
 // Tests that the the time until next try increase exponentially when the state
 // changes from non-error to error.
 TEST(ReadingListEntry, TimeUntilNextTry) {
   base::SimpleTestTickClock clock;
   std::unique_ptr<net::BackoffEntry> backoff =
       base::MakeUnique<net::BackoffEntry>(&ReadingListEntry::kBackoffPolicy,
                                           &clock);
@@ skipping 71 matching lines @@
       base::MakeUnique<net::BackoffEntry>(&ReadingListEntry::kBackoffPolicy,
                                           &clock);
   ReadingListEntry e(GURL("http://example.com"), "bar", std::move(backoff));
   double fuzzing = ReadingListEntry::kBackoffPolicy.jitter_factor;
 
   e.SetDistilledState(ReadingListEntry::ERROR);
   ASSERT_NEAR(kFirstBackoff, e.TimeUntilNextTry().InMinutes(),
               kFirstBackoff * fuzzing);
 
   // Action.
-  e.SetDistilledPath(base::FilePath("distilled/page.html"));
+  const base::FilePath distilled_path("distilled/page.html");
+  const GURL distilled_url("http://example.com/distilled");
+  e.SetDistilledInfo(distilled_path, distilled_url);
 
   // Test.
   EXPECT_EQ(0, e.TimeUntilNextTry().InSeconds());
   e.SetDistilledState(ReadingListEntry::ERROR);
   ASSERT_NEAR(kFirstBackoff, e.TimeUntilNextTry().InMinutes(),
               kFirstBackoff * fuzzing);
 }
 
 // Tests that the failed download counter is incremented when the state change
 // from non-error to error.
@@ skipping 80 matching lines @@
   EXPECT_EQ(pb_entry->failed_download_counter(), 0);
   EXPECT_NE(pb_entry->backoff(), "");
 
   entry.SetDistilledState(ReadingListEntry::WILL_RETRY);
   std::unique_ptr<reading_list::ReadingListLocal> will_retry_pb_entry(
       entry.AsReadingListLocal());
   EXPECT_EQ(will_retry_pb_entry->distillation_state(),
             reading_list::ReadingListLocal::WILL_RETRY);
   EXPECT_EQ(will_retry_pb_entry->failed_download_counter(), 1);
 
-  entry.SetDistilledPath(base::FilePath("distilled/page.html"));
+  const base::FilePath distilled_path("distilled/page.html");
+  const GURL distilled_url("http://example.com/distilled");
+  entry.SetDistilledInfo(distilled_path, distilled_url);
   entry.SetRead(true);
   entry.MarkEntryUpdated();
   EXPECT_NE(entry.UpdateTime(), creation_time_us);
   std::unique_ptr<reading_list::ReadingListLocal> distilled_pb_entry(
       entry.AsReadingListLocal());
   EXPECT_EQ(distilled_pb_entry->creation_time_us(), creation_time_us);
   EXPECT_EQ(distilled_pb_entry->update_time_us(), entry.UpdateTime());
   EXPECT_NE(distilled_pb_entry->backoff(), "");
   EXPECT_EQ(distilled_pb_entry->status(), reading_list::ReadingListLocal::READ);
   EXPECT_EQ(distilled_pb_entry->distillation_state(),
@@ skipping 52 matching lines @@
   EXPECT_EQ(local_entry.Title(), "title2");
   EXPECT_FALSE(local_entry.HasBeenSeen());
   EXPECT_EQ(local_entry.UpdateTime(), sync_update_time_us);
   EXPECT_EQ(local_entry.FailedDownloadCounter(), 1);
   EXPECT_EQ(local_entry.DistilledState(), ReadingListEntry::ERROR);
   base::Time merge_next_call =
       base::Time::Now() + local_entry.TimeUntilNextTry();
   base::TimeDelta delta = merge_next_call - next_call;
   EXPECT_NEAR(delta.InMillisecondsRoundedUp(), 0, 10);
 }