Add title update merge logic to reading list entry

components/reading_list/ios/reading_list_store_unittest.mm

Index: components/reading_list/ios/reading_list_store_unittest.mm
diff --git a/components/reading_list/ios/reading_list_store_unittest.mm b/components/reading_list/ios/reading_list_store_unittest.mm
index e6e00304a50c2fedeb3f5040bf39c33e31235065..7bc3f715efef0b4152f71a5cae9bb6df2b3672ca 100644
--- a/components/reading_list/ios/reading_list_store_unittest.mm
+++ b/components/reading_list/ios/reading_list_store_unittest.mm
@@ -331,6 +331,8 @@ TEST_F(ReadingListStoreTest, CompareEntriesForSync) {
   entryB.set_first_read_time_us(50);
   entryA.set_update_time_us(100);
   entryB.set_update_time_us(100);
+  entryA.set_update_title_time_us(110);
+  entryB.set_update_title_time_us(110);
   // Equal entries can be submitted.
   ExpectAB(entryA, entryB, true);
   ExpectAB(entryB, entryA, true);
@@ -343,18 +345,43 @@ TEST_F(ReadingListStoreTest, CompareEntriesForSync) {
   EXPECT_FALSE(ReadingListStore::CompareEntriesForSync(entryB, entryA));
   entryA.set_url("http://foo.bar/");
 
-  // You can set a title to a title later in alphabetical order.
+  // You can set a title to a title later in alphabetical order if the
+  // update_title_time is the same. If a title has been more recently updated,
+  // the only possible transition is to this one.
   entryA.set_title("");
   ExpectAB(entryA, entryB, true);
   ExpectAB(entryB, entryA, false);
+  entryA.set_update_title_time_us(109);
+  ExpectAB(entryA, entryB, true);
+  ExpectAB(entryB, entryA, false);
+  entryA.set_update_title_time_us(110);
+

[pavely, 2017/01/04 00:12:32]

I think set_update_title_time_us is logically related to corresponding call to
set_title. I would put empty line before set_update_title_time_us, not after it.
The same applies to two more places below.

[gambard, 2017/01/04 09:57:02]

set_update_title_time_us(110); reset the value of the update_title_time_us to
its default value. This is why it is the last line of the paragraph.

   entryA.set_title("Foo Aar");
   ExpectAB(entryA, entryB, true);
   ExpectAB(entryB, entryA, false);
+  entryA.set_update_title_time_us(109);
+  ExpectAB(entryA, entryB, true);
+  ExpectAB(entryB, entryA, false);
+  entryA.set_update_title_time_us(110);
+
   entryA.set_title("Foo Ba");
   ExpectAB(entryA, entryB, true);
   ExpectAB(entryB, entryA, false);
+  entryA.set_update_title_time_us(109);
+  ExpectAB(entryA, entryB, true);
+  ExpectAB(entryB, entryA, false);
+  entryA.set_update_title_time_us(110);
+
+  entryA.set_title("Foo Bas");
+  ExpectAB(entryA, entryB, false);
+  ExpectAB(entryB, entryA, true);
+  entryA.set_update_title_time_us(109);
+  ExpectAB(entryA, entryB, true);
+  ExpectAB(entryB, entryA, false);
+  entryA.set_update_title_time_us(110);
   entryA.set_title("Foo Bar");
 
+  // Update times.
   entryA.set_creation_time_us(9);
   ExpectAB(entryA, entryB, true);
   ExpectAB(entryB, entryA, false);