Refactor Reading List Model to use URL as key.

ios/chrome/browser/reading_list/reading_list_download_service.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 "ios/chrome/browser/reading_list/reading_list_download_service.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
@@ skipping 40 matching lines @@
 void ReadingListDownloadService::Shutdown() {
   reading_list_model_->RemoveObserver(this);
 }
 
 void ReadingListDownloadService::ReadingListModelLoaded(
     const ReadingListModel* model) {
   DCHECK_EQ(reading_list_model_, model);
   DownloadAllEntries();
 }
 
-void ReadingListDownloadService::ReadingListWillRemoveReadEntry(
+void ReadingListDownloadService::ReadingListWillRemoveEntry(
     const ReadingListModel* model,
-    size_t index) {
+    const GURL& url) {
   DCHECK_EQ(reading_list_model_, model);
-  RemoveDownloadedEntry(model->GetReadEntryAtIndex(index));
+  const ReadingListEntry* entry = model->GetEntryFromURL(url);
+  DCHECK(entry);
+  RemoveDownloadedEntry(*entry);
 }
 
-void ReadingListDownloadService::ReadingListWillRemoveUnreadEntry(
-    const ReadingListModel* model,
-    size_t index) {
-  DCHECK_EQ(reading_list_model_, model);
-  RemoveDownloadedEntry(model->GetUnreadEntryAtIndex(index));
-}
-
-void ReadingListDownloadService::ReadingListWillAddUnreadEntry(
+void ReadingListDownloadService::ReadingListWillAddEntry(
     const ReadingListModel* model,
     const ReadingListEntry& entry) {
   DCHECK_EQ(reading_list_model_, model);
-  ScheduleDownloadEntry(entry);
-}
-
-void ReadingListDownloadService::ReadingListWillAddReadEntry(
-    const ReadingListModel* model,
-    const ReadingListEntry& entry) {
-  DCHECK_EQ(reading_list_model_, model);
   ScheduleDownloadEntry(entry);
 }
 
 void ReadingListDownloadService::DownloadAllEntries() {
   DCHECK(reading_list_model_->loaded());
   size_t size = reading_list_model_->unread_size();
   for (size_t i = 0; i < size; i++) {
-    const ReadingListEntry& entry =
-        reading_list_model_->GetUnreadEntryAtIndex(i);
-    this->ScheduleDownloadEntry(entry);
+    const ReadingListEntry* entry = reading_list_model_->GetUnreadEntryAt(i);
+    DCHECK(entry);
+    this->ScheduleDownloadEntry(*entry);
   }
   size = reading_list_model_->read_size();
   for (size_t i = 0; i < size; i++) {
-    const ReadingListEntry& entry = reading_list_model_->GetReadEntryAtIndex(i);
-    this->ScheduleDownloadEntry(entry);
+    const ReadingListEntry* entry = reading_list_model_->GetReadEntryAt(i);
+    DCHECK(entry);
+    this->ScheduleDownloadEntry(*entry);
   }
 }
 
 void ReadingListDownloadService::ScheduleDownloadEntry(
     const ReadingListEntry& entry) {
   DCHECK(reading_list_model_->loaded());
   if (entry.DistilledState() == ReadingListEntry::ERROR ||
       entry.DistilledState() == ReadingListEntry::PROCESSED)
     return;
 
   web::WebThread::PostDelayedTask(
       web::WebThread::UI, FROM_HERE,
       base::Bind(&ReadingListDownloadService::DownloadEntryFromURL,
                  weak_ptr_factory_.GetWeakPtr(), entry.URL()),
       entry.TimeUntilNextTry());
 }
 
 void ReadingListDownloadService::ScheduleDownloadEntryFromURL(const GURL& url) {

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

Exist only because the entry could not been requested as a pointer. It could be
merged with ScheduleDownloadEntry.

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

Done.

   auto download_callback =
       base::Bind(&ReadingListDownloadService::ScheduleDownloadEntry,
                  base::Unretained(this));
   reading_list_model_->CallbackEntryURL(url, download_callback);
 }
 
 void ReadingListDownloadService::DownloadEntryFromURL(const GURL& url) {

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

Same as above.

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

Done.

   auto download_callback = base::Bind(
       &ReadingListDownloadService::DownloadEntry, base::Unretained(this));
   reading_list_model_->CallbackEntryURL(url, download_callback);
 }
 
 void ReadingListDownloadService::DownloadEntry(const ReadingListEntry& entry) {
   DCHECK(reading_list_model_->loaded());
   if (entry.DistilledState() == ReadingListEntry::ERROR ||
       entry.DistilledState() == ReadingListEntry::PROCESSED)
     return;
@@ skipping 26 matching lines @@
 
     } else {
       // The connection is not wifi, save it for download when the connection
       // changes to wifi.
       url_to_download_wifi_.push_back(entry.URL());
     }
   }
 }
 
 void ReadingListDownloadService::RemoveDownloadedEntry(
     const ReadingListEntry& entry) {

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

This method only uses the URL. Pass the URL as argument instead of the entry?

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

Done.

   DCHECK(reading_list_model_->loaded());
   url_downloader_->RemoveOfflineURL(entry.URL());
 }
 
 void ReadingListDownloadService::OnDownloadEnd(
     const GURL& url,
     URLDownloader::SuccessState success,
     const base::FilePath& distilled_path,
     const std::string& title) {
   DCHECK(reading_list_model_->loaded());
@@ skipping 28 matching lines @@
     for (auto& url : url_to_download_cellular_) {
       ScheduleDownloadEntryFromURL(url);
     }
   }
   if (type == net::NetworkChangeNotifier::CONNECTION_WIFI) {
     for (auto& url : url_to_download_wifi_) {
       ScheduleDownloadEntryFromURL(url);
     }
   }
 }