Add merge rules for first read time

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/simple_test_tick_clock.h"
 #include "components/reading_list/ios/proto/reading_list.pb.h"
 #include "components/sync/protocol/reading_list_specifics.pb.h"
@@ skipping 299 matching lines @@
   EXPECT_EQ(waiting_entry->FailedDownloadCounter(), 2);
   EXPECT_EQ(waiting_entry->DistilledState(), ReadingListEntry::WAITING);
   EXPECT_EQ(waiting_entry->DistilledPath(), base::FilePath());
   base::Time waiting_next_call =
       base::Time::Now() + waiting_entry->TimeUntilNextTry();
   base::TimeDelta delta = next_call - waiting_next_call;
   EXPECT_NEAR(delta.InMillisecondsRoundedUp(), 0, 10);
 }
 
 // Tests the merging of two ReadingListEntry.
+// Additional merging tests are done in
+// ReadingListStoreTest.CompareEntriesForSync
 TEST(ReadingListEntry, MergeWithEntry) {
   ReadingListEntry local_entry(GURL("http://example.com/"), "title");
   local_entry.SetDistilledState(ReadingListEntry::ERROR);
   base::Time next_call = base::Time::Now() + local_entry.TimeUntilNextTry();
   int64_t local_update_time_us = local_entry.UpdateTime();
 
   ReadingListEntry sync_entry(GURL("http://example.com/"), "title2");
   sync_entry.SetDistilledState(ReadingListEntry::ERROR);
   int64_t sync_update_time_us = sync_entry.UpdateTime();
   EXPECT_NE(local_update_time_us, sync_update_time_us);
   local_entry.MergeWithEntry(sync_entry);
   EXPECT_EQ(local_entry.URL().spec(), "http://example.com/");
   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);
 }
-
-// Tests the merging of two ReadingListEntry, the oldest one SEEN and the newer
-// UNSEEN.
-TEST(ReadingListEntry, MergeWithEntrySeen) {
-  ReadingListEntry local_entry(GURL("http://example.com/"), "title");
-  local_entry.SetRead(true);
-  int64_t local_update_time_us = local_entry.UpdateTime();
-  local_entry.SetDistilledPath(base::FilePath("distilled/page.html"));
-
-  ReadingListEntry sync_entry(GURL("http://example.com/"), "title2");
-  int64_t sync_update_time_us = sync_entry.UpdateTime();
-  EXPECT_NE(local_update_time_us, sync_update_time_us);
-  local_entry.MergeWithEntry(sync_entry);
-  EXPECT_EQ(local_entry.URL().spec(), "http://example.com/");
-  EXPECT_EQ(local_entry.Title(), "title2");
-  EXPECT_TRUE(local_entry.HasBeenSeen());
-  EXPECT_EQ(local_entry.UpdateTime(), sync_update_time_us);
-  EXPECT_EQ(local_entry.FailedDownloadCounter(), 0);
-  EXPECT_EQ(local_entry.DistilledState(), ReadingListEntry::PROCESSED);
-  EXPECT_EQ(local_entry.DistilledPath().value(), "distilled/page.html");
-}