Add title update merge logic to reading list entry

components/reading_list/ios/reading_list_store.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_store.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "components/reading_list/ios/proto/reading_list.pb.h"
@@ skipping 400 matching lines @@
   DCHECK(CalledOnValidThread());
   return entity_data.specifics.reading_list().entry_id();
 }
 
 bool ReadingListStore::CompareEntriesForSync(
     const sync_pb::ReadingListSpecifics& lhs,
     const sync_pb::ReadingListSpecifics& rhs) {
   DCHECK(lhs.entry_id() == rhs.entry_id());
   DCHECK(lhs.has_update_time_us());
   DCHECK(rhs.has_update_time_us());
+  DCHECK(lhs.has_update_title_time_us());
+  DCHECK(rhs.has_update_title_time_us());
   DCHECK(lhs.has_creation_time_us());
   DCHECK(rhs.has_creation_time_us());
   DCHECK(lhs.has_url());
   DCHECK(rhs.has_url());
   DCHECK(lhs.has_title());
   DCHECK(rhs.has_title());
   DCHECK(lhs.has_status());
   DCHECK(rhs.has_status());
-  if (rhs.url() != lhs.url() || rhs.title().compare(lhs.title()) < 0 ||
+  if (rhs.url() != lhs.url() ||
+      rhs.update_title_time_us() < lhs.update_title_time_us() ||
       rhs.creation_time_us() < lhs.creation_time_us() ||
       rhs.update_time_us() < lhs.update_time_us()) {
     return false;
   }
   if (rhs.update_time_us() == lhs.update_time_us()) {
     if ((rhs.status() == sync_pb::ReadingListSpecifics::UNSEEN &&
          lhs.status() != sync_pb::ReadingListSpecifics::UNSEEN) ||
         (rhs.status() == sync_pb::ReadingListSpecifics::UNREAD &&
          lhs.status() == sync_pb::ReadingListSpecifics::READ))
       return false;
   }
+  if (rhs.update_title_time_us() == lhs.update_title_time_us()) {
+    if (rhs.title().compare(lhs.title()) < 0)
+      return false;
+  }
   if (rhs.creation_time_us() == lhs.creation_time_us()) {
     if (rhs.first_read_time_us() == 0 && lhs.first_read_time_us() != 0) {
       return false;
     }
     if (rhs.first_read_time_us() > lhs.first_read_time_us() &&
         lhs.first_read_time_us() != 0) {
       return false;
     }
   }
   return true;
 }