Add title update merge logic to reading list entry

components/reading_list/ios/reading_list_entry.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/json/json_string_value_serializer.h"
 #include "base/memory/ptr_util.h"
 #include "components/reading_list/ios/offline_url_utils.h"
 #include "components/reading_list/ios/proto/reading_list.pb.h"
@@ skipping 33 matching lines @@
 
 ReadingListEntry::ReadingListEntry(const GURL& url,
                                    const std::string& title,
                                    std::unique_ptr<net::BackoffEntry> backoff)
     : ReadingListEntry(url,
                        title,
                        UNSEEN,
                        0,
                        0,
                        0,
+                       0,
                        WAITING,
                        base::FilePath(),
                        0,
                        std::move(backoff)) {}
 
 ReadingListEntry::ReadingListEntry(
     const GURL& url,
     const std::string& title,
     State state,
     int64_t creation_time,
     int64_t first_read_time,
     int64_t update_time,
+    int64_t update_title_time,
     ReadingListEntry::DistillationState distilled_state,
     const base::FilePath& distilled_path,
     int failed_download_counter,
     std::unique_ptr<net::BackoffEntry> backoff)
     : url_(url),
       title_(title),
       state_(state),
       distilled_path_(distilled_path),
       distilled_state_(distilled_state),
       failed_download_counter_(failed_download_counter),
       creation_time_us_(creation_time),
       first_read_time_us_(first_read_time),
-      update_time_us_(update_time) {
+      update_time_us_(update_time),
+      update_title_time_us_(update_title_time) {
   if (backoff) {
     backoff_ = std::move(backoff);
   } else {
     backoff_ = base::MakeUnique<net::BackoffEntry>(&kBackoffPolicy);
   }
   if (creation_time_us_ == 0) {
     DCHECK(update_time_us_ == 0);
+    DCHECK(update_title_time_us_ == 0);
     creation_time_us_ =
         (base::Time::Now() - base::Time::UnixEpoch()).InMicroseconds();
     update_time_us_ = creation_time_us_;
+    update_title_time_us_ = creation_time_us_;
   }
   DCHECK(!url.is_empty());
   DCHECK(url.is_valid());
 }
 
 ReadingListEntry::ReadingListEntry(ReadingListEntry&& entry)
     : url_(std::move(entry.url_)),
       title_(std::move(entry.title_)),
       state_(std::move(entry.state_)),
       distilled_path_(std::move(entry.distilled_path_)),
       distilled_state_(std::move(entry.distilled_state_)),
       backoff_(std::move(entry.backoff_)),
       failed_download_counter_(std::move(entry.failed_download_counter_)),
       creation_time_us_(std::move(entry.creation_time_us_)),
       first_read_time_us_(std::move(entry.first_read_time_us_)),
-      update_time_us_(std::move(entry.update_time_us_)) {}
+      update_time_us_(std::move(entry.update_time_us_)),
+      update_title_time_us_(std::move(entry.update_title_time_us_)) {}
 
 ReadingListEntry::~ReadingListEntry() {}
 
 const GURL& ReadingListEntry::URL() const {
   return url_;
 }
 
 const std::string& ReadingListEntry::Title() const {
   return title_;
 }
@@ skipping 18 matching lines @@
   url_ = std::move(other.url_);
   title_ = std::move(other.title_);
   distilled_path_ = std::move(other.distilled_path_);
   distilled_state_ = std::move(other.distilled_state_);
   backoff_ = std::move(other.backoff_);
   state_ = std::move(other.state_);
   failed_download_counter_ = std::move(other.failed_download_counter_);
   creation_time_us_ = std::move(other.creation_time_us_);
   first_read_time_us_ = std::move(other.first_read_time_us_);
   update_time_us_ = std::move(other.update_time_us_);
+  update_title_time_us_ = std::move(other.update_title_time_us_);
   return *this;
 }
 
 bool ReadingListEntry::operator==(const ReadingListEntry& other) const {
   return url_ == other.url_;
 }
 
 void ReadingListEntry::SetTitle(const std::string& title) {
   title_ = title;
+  update_title_time_us_ =
+      (base::Time::Now() - base::Time::UnixEpoch()).InMicroseconds();
 }
 
 void ReadingListEntry::SetRead(bool read) {
   state_ = read ? READ : UNREAD;
   if (FirstReadTime() == 0 && read) {
     first_read_time_us_ =
         (base::Time::Now() - base::Time::UnixEpoch()).InMicroseconds();
   }
   MarkEntryUpdated();
 }
@@ skipping 26 matching lines @@
   }
 
   distilled_state_ = distilled_state;
   distilled_path_ = base::FilePath();
 }
 
 int64_t ReadingListEntry::UpdateTime() const {
   return update_time_us_;
 }
 
+int64_t ReadingListEntry::UpdateTitleTime() const {
+  return update_title_time_us_;
+}
+
 int64_t ReadingListEntry::CreationTime() const {
   return creation_time_us_;
 }
 
 int64_t ReadingListEntry::FirstReadTime() const {
   return first_read_time_us_;
 }
 
 void ReadingListEntry::MarkEntryUpdated() {
   update_time_us_ =
@@ skipping 23 matching lines @@
   int64_t first_read_time_us = 0;
   if (pb_entry.has_first_read_time_us()) {
     first_read_time_us = pb_entry.first_read_time_us();
   }
 
   int64_t update_time_us = 0;
   if (pb_entry.has_update_time_us()) {
     update_time_us = pb_entry.update_time_us();
   }
 
+  int64_t update_title_time_us = 0;
+  if (pb_entry.has_update_title_time_us()) {
+    update_title_time_us = pb_entry.update_title_time_us();
+  }
+
   State state = UNSEEN;
   if (pb_entry.has_status()) {
     switch (pb_entry.status()) {
       case reading_list::ReadingListLocal::READ:
         state = READ;
         break;
       case reading_list::ReadingListLocal::UNREAD:
         state = UNREAD;
         break;
       case reading_list::ReadingListLocal::UNSEEN:
@@ skipping 40 matching lines @@
     std::unique_ptr<base::Value> value(
         deserializer.Deserialize(nullptr, nullptr));
     if (value) {
       backoff = net::BackoffEntrySerializer::DeserializeFromValue(
           *value, &kBackoffPolicy, nullptr, base::Time::Now());
     }
   }
 
   return base::WrapUnique<ReadingListEntry>(new ReadingListEntry(
       url, title, state, creation_time_us, first_read_time_us, update_time_us,
-      distillation_state, distilled_path, failed_download_counter,
-      std::move(backoff)));
+      update_title_time_us, distillation_state, distilled_path,
+      failed_download_counter, std::move(backoff)));
 }
 
 // static
 std::unique_ptr<ReadingListEntry> ReadingListEntry::FromReadingListSpecifics(
     const sync_pb::ReadingListSpecifics& pb_entry) {
   if (!pb_entry.has_url()) {
     return nullptr;
   }
   GURL url(pb_entry.url());
   if (url.is_empty() || !url.is_valid()) {
@@ skipping 12 matching lines @@
   int64_t first_read_time_us = 0;
   if (pb_entry.has_first_read_time_us()) {
     first_read_time_us = pb_entry.first_read_time_us();
   }
 
   int64_t update_time_us = 0;
   if (pb_entry.has_update_time_us()) {
     update_time_us = pb_entry.update_time_us();
   }
 
+  int64_t update_title_time_us = 0;
+  if (pb_entry.has_update_title_time_us()) {
+    update_title_time_us = pb_entry.update_title_time_us();
+  }
+
   State state = UNSEEN;
   if (pb_entry.has_status()) {
     switch (pb_entry.status()) {
       case sync_pb::ReadingListSpecifics::READ:
         state = READ;
         break;
       case sync_pb::ReadingListSpecifics::UNREAD:
         state = UNREAD;
         break;
       case sync_pb::ReadingListSpecifics::UNSEEN:
         state = UNSEEN;
         break;
     }
   }
 
   return base::WrapUnique<ReadingListEntry>(new ReadingListEntry(
       url, title, state, creation_time_us, first_read_time_us, update_time_us,
-      WAITING, base::FilePath(), 0, nullptr));
+      update_title_time_us, WAITING, base::FilePath(), 0, nullptr));
 }
 
 void ReadingListEntry::MergeWithEntry(const ReadingListEntry& other) {
 #if !defined(NDEBUG)
   // Checks that the result entry respects the sync order.
   std::unique_ptr<sync_pb::ReadingListSpecifics> old_this_pb(
       AsReadingListSpecifics());
   std::unique_ptr<sync_pb::ReadingListSpecifics> other_pb(
       other.AsReadingListSpecifics());
 #endif
   DCHECK(url_ == other.url_);
-  if (title_.compare(other.title_) < 0) {
-    // Take the last in alphabetical order or the longer one.
-    // This ensure empty string is replaced.
+  if (update_title_time_us_ < other.update_title_time_us_) {
+    // Take the most recent title updated.
     title_ = std::move(other.title_);

[Olivier, 2016/12/21 15:14:01]

what if there is a tie?

[gambard, 2016/12/21 16:38:00]

Done.

+    update_title_time_us_ = std::move(other.update_title_time_us_);
   }
   if (creation_time_us_ < other.creation_time_us_) {
     creation_time_us_ = std::move(other.creation_time_us_);
     first_read_time_us_ = std::move(other.first_read_time_us_);
   } else if (creation_time_us_ == other.creation_time_us_) {
     // The first_time_read_us from |other| is used if
     // - this.first_time_read_us == 0: the entry was never read in this device.
     // - this.first_time_read_us > other.first_time_read_us: the entry was
     //       first read on another device.
     if (first_read_time_us_ == 0 ||
@@ skipping 26 matching lines @@
       base::MakeUnique<reading_list::ReadingListLocal>();
 
   // URL is used as the key for the database and sync as there is only one entry
   // per URL.
   pb_entry->set_entry_id(URL().spec());
   pb_entry->set_title(Title());
   pb_entry->set_url(URL().spec());
   pb_entry->set_creation_time_us(CreationTime());
   pb_entry->set_first_read_time_us(FirstReadTime());
   pb_entry->set_update_time_us(UpdateTime());
+  pb_entry->set_update_title_time_us(UpdateTitleTime());
 
   switch (state_) {
     case READ:
       pb_entry->set_status(reading_list::ReadingListLocal::READ);
       break;
     case UNREAD:
       pb_entry->set_status(reading_list::ReadingListLocal::UNREAD);
       break;
     case UNSEEN:
       pb_entry->set_status(reading_list::ReadingListLocal::UNSEEN);
@@ skipping 43 matching lines @@
       base::MakeUnique<sync_pb::ReadingListSpecifics>();
 
   // URL is used as the key for the database and sync as there is only one entry
   // per URL.
   pb_entry->set_entry_id(URL().spec());
   pb_entry->set_title(Title());
   pb_entry->set_url(URL().spec());
   pb_entry->set_creation_time_us(CreationTime());
   pb_entry->set_first_read_time_us(FirstReadTime());
   pb_entry->set_update_time_us(UpdateTime());
+  pb_entry->set_update_title_time_us(UpdateTitleTime());
 
   switch (state_) {
     case READ:
       pb_entry->set_status(sync_pb::ReadingListSpecifics::READ);
       break;
     case UNREAD:
       pb_entry->set_status(sync_pb::ReadingListSpecifics::UNREAD);
       break;
     case UNSEEN:
       pb_entry->set_status(sync_pb::ReadingListSpecifics::UNSEEN);
       break;
   }
 
   return pb_entry;
 }