Refactor Reading List Model to use URL as key.

ios/chrome/browser/reading_list/reading_list_model_bridge_observer.h

Index: ios/chrome/browser/reading_list/reading_list_model_bridge_observer.h
diff --git a/ios/chrome/browser/reading_list/reading_list_model_bridge_observer.h b/ios/chrome/browser/reading_list/reading_list_model_bridge_observer.h
index aa7c4f7830a92e098a972f49ef67776e0c0ee03d..6528cc52b445ea833eaa401ec630c44638dd2d03 100644
--- a/ios/chrome/browser/reading_list/reading_list_model_bridge_observer.h
+++ b/ios/chrome/browser/reading_list/reading_list_model_bridge_observer.h
@@ -15,23 +15,19 @@
 @protocol ReadingListModelBridgeObserver<NSObject>
 
 @required
+
 - (void)readingListModelLoaded:(const ReadingListModel*)model;
 - (void)readingListModelDidApplyChanges:(const ReadingListModel*)model;
 
 @optional
 - (void)readingListModel:(const ReadingListModel*)model
-    willRemoveUnreadEntryAtIndex:(size_t)index;
-- (void)readingListModel:(const ReadingListModel*)model
-    willRemoveReadEntryAtIndex:(size_t)index;
+         willRemoveEntry:(const GURL&)url;
 
 - (void)readingListModel:(const ReadingListModel*)model
-           willMoveEntry:(size_t)unreadIndex
-                  isRead:(BOOL)read;
+           willMoveEntry:(const GURL&)url;
 
 - (void)readingListModel:(const ReadingListModel*)model
-      willAddUnreadEntry:(const ReadingListEntry&)entry;
-- (void)readingListModel:(const ReadingListModel*)model
-        willAddReadEntry:(const ReadingListEntry&)entry;
+            willAddEntry:(const ReadingListEntry&)url;

[gambard, 2016/11/23 12:11:06]

From your CL description, WillAddEntry should pass the entry not the URL.

[Olivier, 2016/11/28 14:54:14]

Done.

 
 - (void)readingListModelBeganBatchUpdates:(const ReadingListModel*)model;
 - (void)readingListModelCompletedBatchUpdates:(const ReadingListModel*)model;
@@ -39,9 +35,7 @@
 - (void)readingListModelBeingDeleted:(const ReadingListModel*)model;
 
 - (void)readingListModel:(const ReadingListModel*)model
-    willUpdateUnreadEntryAtIndex:(size_t)index;
-- (void)readingListModel:(const ReadingListModel*)model
-    willUpdateReadEntryAtIndex:(size_t)index;
+         willUpdateEntry:(const GURL&)url;
 
 @end
 
@@ -61,22 +55,15 @@ class ReadingListModelBridge : public ReadingListModelObserver {
       const ReadingListModel* model) override;
   void ReadingListModelLoaded(const ReadingListModel* model) override;
   void ReadingListModelBeingDeleted(const ReadingListModel* model) override;
-  void ReadingListWillRemoveUnreadEntry(const ReadingListModel* model,
-                                        size_t index) override;
-  void ReadingListWillRemoveReadEntry(const ReadingListModel* model,
-                                      size_t index) override;
+  void ReadingListWillRemoveEntry(const ReadingListModel* model,
+                                  const GURL& url) override;
   void ReadingListWillMoveEntry(const ReadingListModel* model,
-                                size_t index,
-                                bool read) override;
-  void ReadingListWillAddUnreadEntry(const ReadingListModel* model,
-                                     const ReadingListEntry& entry) override;
-  void ReadingListWillAddReadEntry(const ReadingListModel* model,
-                                   const ReadingListEntry& entry) override;
+                                const GURL& url) override;
+  void ReadingListWillAddEntry(const ReadingListModel* model,
+                               const ReadingListEntry& entry) override;
   void ReadingListDidApplyChanges(ReadingListModel* model) override;
-  void ReadingListWillUpdateUnreadEntry(const ReadingListModel* model,
-                                        size_t index) override;
-  void ReadingListWillUpdateReadEntry(const ReadingListModel* model,
-                                      size_t index) override;
+  void ReadingListWillUpdateEntry(const ReadingListModel* model,
+                                  const GURL& url) override;
 
   __unsafe_unretained id<ReadingListModelBridgeObserver> observer_;
   ReadingListModel* model_;  // weak