Add merge rules for first read time

components/reading_list/ios/reading_list_store.h

 // 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.
 
 #ifndef COMPONENTS_READING_LIST_IOS_READING_LIST_STORE_H_
 #define COMPONENTS_READING_LIST_IOS_READING_LIST_STORE_H_
 
 #include "base/threading/non_thread_safe.h"
 #include "components/reading_list/ios/reading_list_model_storage.h"
 #include "components/reading_list/ios/reading_list_store_delegate.h"
@@ skipping 62 matching lines @@
       syncer::EntityChangeList entity_changes) override;
 
   // Returns whether entries respect a strict order for sync and if |rhs| can be
   // submitted to sync after |lhs| has been received.
   // The order should ensure that there is no sync loop in sync and should be
   // submitted to sync in strictly increasing order.
   // Entries are in increasing order if all the fields respect increasing order.
   // - URL must be the same.
   // - title must verify rhs.title.compare(lhs.title) >= 0
   // - rhs.creation_time_us >= lhs.creation_time_us
+  // - if rhs.creation_time_us > lhs.creation_time_us, rhs.first_read_time_us
+  //          can be anything.
+  // - if rhs.creation_time_us == lhs.creation_time_us, t

[gambard, 2016/12/09 08:06:55]

remove "t"

+  //          rhs.first_read_time_us <= lhs.first_read_time_us

[gambard, 2016/12/09 08:06:55]

What happens if lhs.first_read_time_us == 0?

   // - rhs.update_time_us >= lhs.update_time_us
   // - if rhs.update_time_us > lhs.update_time_us, rhs.state can be anything.
   // - if rhs.update_time_us == lhs.update_time_us, rhs.state >= lhs.state in
   //          the order UNSEEN, UNREAD, READ.
   static bool CompareEntriesForSync(const sync_pb::ReadingListSpecifics& lhs,
                                     const sync_pb::ReadingListSpecifics& rhs);
 
   // Asynchronously retrieve the corresponding sync data for |storage_keys|.
   void GetData(StorageKeyList storage_keys, DataCallback callback) override;
 
@@ skipping 50 matching lines @@
   std::unique_ptr<syncer::ModelTypeStore> store_;
   ReadingListModel* model_;
   ReadingListStoreDelegate* delegate_;
   StoreFactoryFunction create_store_callback_;
 
   int pending_transaction_count_;
   std::unique_ptr<syncer::ModelTypeStore::WriteBatch> batch_;
 };
 
 #endif  // COMPONENTS_READING_LIST_IOS_READING_LIST_STORE_H_