Refactor Reading List Model to use URL as key.

ios/chrome/browser/reading_list/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 "ios/chrome/browser/reading_list/reading_list_entry.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "components/sync/protocol/reading_list_specifics.pb.h"
 #include "ios/chrome/browser/reading_list/proto/reading_list.pb.h"
@@ skipping 175 matching lines @@
   EXPECT_EQ(2, e.FailedDownloadCounter());
 }
 
 // Tests that the reading list entry is correctly encoded to
 // sync_pb::ReadingListSpecifics.
 TEST(ReadingListEntry, AsReadingListSpecifics) {
   ReadingListEntry entry(GURL("http://example.com/"), "bar");
   int64_t creation_time_us = entry.UpdateTime();
 
   std::unique_ptr<sync_pb::ReadingListSpecifics> pb_entry(
-      entry.AsReadingListSpecifics(false));
+      entry.AsReadingListSpecifics());
   EXPECT_EQ(pb_entry->entry_id(), "http://example.com/");
   EXPECT_EQ(pb_entry->url(), "http://example.com/");
   EXPECT_EQ(pb_entry->title(), "bar");
   EXPECT_EQ(pb_entry->creation_time_us(), creation_time_us);
   EXPECT_EQ(pb_entry->update_time_us(), entry.UpdateTime());
   EXPECT_EQ(pb_entry->status(), sync_pb::ReadingListSpecifics::UNREAD);
 
-  entry.MarkEntryUpdated();
+  entry.SetRead(true);
   EXPECT_NE(entry.UpdateTime(), creation_time_us);
   std::unique_ptr<sync_pb::ReadingListSpecifics> updated_pb_entry(
-      entry.AsReadingListSpecifics(true));
+      entry.AsReadingListSpecifics());
   EXPECT_EQ(updated_pb_entry->creation_time_us(), creation_time_us);
   EXPECT_EQ(updated_pb_entry->update_time_us(), entry.UpdateTime());
   EXPECT_EQ(updated_pb_entry->status(), sync_pb::ReadingListSpecifics::READ);
 }
 
 // Tests that the reading list entry is correctly parsed from
 // sync_pb::ReadingListSpecifics.
 TEST(ReadingListEntry, FromReadingListSpecifics) {
   std::unique_ptr<sync_pb::ReadingListSpecifics> pb_entry =
       base::MakeUnique<sync_pb::ReadingListSpecifics>();
@@ skipping 12 matching lines @@
   EXPECT_EQ(entry->FailedDownloadCounter(), 0);
 }
 
 // Tests that the reading list entry is correctly encoded to
 // reading_list::ReadingListLocal.
 TEST(ReadingListEntry, AsReadingListLocal) {
   ReadingListEntry entry(GURL("http://example.com/"), "bar");
   int64_t creation_time_us = entry.UpdateTime();
 
   std::unique_ptr<reading_list::ReadingListLocal> pb_entry(
-      entry.AsReadingListLocal(false));
+      entry.AsReadingListLocal());
   EXPECT_EQ(pb_entry->entry_id(), "http://example.com/");
   EXPECT_EQ(pb_entry->url(), "http://example.com/");
   EXPECT_EQ(pb_entry->title(), "bar");
   EXPECT_EQ(pb_entry->creation_time_us(), creation_time_us);
   EXPECT_EQ(pb_entry->update_time_us(), entry.UpdateTime());
   EXPECT_EQ(pb_entry->status(), reading_list::ReadingListLocal::UNREAD);
   EXPECT_EQ(pb_entry->distillation_state(),
             reading_list::ReadingListLocal::WAITING);
   EXPECT_EQ(pb_entry->distilled_path(), "");
   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(true));
+      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"));
+  entry.SetRead(true);
   entry.MarkEntryUpdated();
   EXPECT_NE(entry.UpdateTime(), creation_time_us);
   std::unique_ptr<reading_list::ReadingListLocal> distilled_pb_entry(
-      entry.AsReadingListLocal(true));
+      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(),
             reading_list::ReadingListLocal::PROCESSED);
   EXPECT_EQ(distilled_pb_entry->distilled_path(), "distilled/page.html");
   EXPECT_EQ(distilled_pb_entry->failed_download_counter(), 0);
 }
 
 // Tests that the reading list entry is correctly parsed from
 // sync_pb::ReadingListLocal.
 TEST(ReadingListEntry, FromReadingListLocal) {
   ReadingListEntry entry(GURL("http://example.com/"), "title");
   base::Time next_call = base::Time::Now() + entry.TimeUntilNextTry();
 
   std::unique_ptr<reading_list::ReadingListLocal> pb_entry(
-      entry.AsReadingListLocal(false));
+      entry.AsReadingListLocal());
 
   pb_entry->set_entry_id("http://example.com/");
   pb_entry->set_url("http://example.com/");
   pb_entry->set_title("title");
   pb_entry->set_creation_time_us(1);
   pb_entry->set_update_time_us(2);
   pb_entry->set_status(reading_list::ReadingListLocal::UNREAD);
   pb_entry->set_distillation_state(reading_list::ReadingListLocal::WAITING);
   pb_entry->set_failed_download_counter(2);
 
@@ skipping 26 matching lines @@
   EXPECT_EQ(sync_entry.URL().spec(), "http://example2.com/");
   EXPECT_EQ(sync_entry.Title(), "title2");
   EXPECT_EQ(sync_entry.UpdateTime(), sync_update_time_us);
   EXPECT_EQ(sync_entry.FailedDownloadCounter(), 0);
   EXPECT_EQ(sync_entry.DistilledState(), ReadingListEntry::PROCESSED);
   EXPECT_EQ(sync_entry.DistilledPath().value(), "distilled/page.html");
   base::Time sync_next_call = base::Time::Now() + sync_entry.TimeUntilNextTry();
   base::TimeDelta delta = next_call - sync_next_call;
   EXPECT_NEAR(delta.InMillisecondsRoundedUp(), 0, 10);
 }