[IOS Reading List] Change handling of distillation error.

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_enumerator.h"
@@ skipping 217 matching lines @@
   url_downloader_->RemoveOfflineURL(url);
 }
 
 void ReadingListDownloadService::OnDownloadEnd(
     const GURL& url,
     const GURL& distilled_url,
     URLDownloader::SuccessState success,
     const base::FilePath& distilled_path,
     const std::string& title) {
   DCHECK(reading_list_model_->loaded());
-  if ((success == URLDownloader::DOWNLOAD_SUCCESS ||
-       success == URLDownloader::DOWNLOAD_EXISTS) &&
-      !distilled_path.empty()) {
-    reading_list_model_->SetEntryDistilledInfo(url, distilled_path,
-                                               distilled_url);
+  URLDownloader::SuccessState real_success_value = success;
+  if (distilled_path.empty()) {
+    real_success_value = URLDownloader::ERROR;
+  }
+  switch (real_success_value) {
+    case URLDownloader::DOWNLOAD_SUCCESS:
+    case URLDownloader::DOWNLOAD_EXISTS: {
+      reading_list_model_->SetEntryDistilledInfo(url, distilled_path,
+                                                 distilled_url);
 
-    std::string trimmed_title = base::CollapseWhitespaceASCII(title, false);
-    if (!trimmed_title.empty())
-      reading_list_model_->SetEntryTitle(url, trimmed_title);
+      std::string trimmed_title = base::CollapseWhitespaceASCII(title, false);
+      if (!trimmed_title.empty())
+        reading_list_model_->SetEntryTitle(url, trimmed_title);
 
-    const ReadingListEntry* entry = reading_list_model_->GetEntryByURL(url);
-    if (entry)
-      UMA_HISTOGRAM_COUNTS_100("ReadingList.Download.Failures",
-                               entry->FailedDownloadCounter());
-    UMA_HISTOGRAM_ENUMERATION("ReadingList.Download.Status", SUCCESS,
-                              STATUS_MAX);
-
-  } else if (success == URLDownloader::ERROR_RETRY) {
-    reading_list_model_->SetEntryDistilledState(url,
-                                                ReadingListEntry::WILL_RETRY);
-    ScheduleDownloadEntry(url);
-
-    const ReadingListEntry* entry = reading_list_model_->GetEntryByURL(url);
-    if (entry) {
-      if (entry->FailedDownloadCounter() < kNumberOfFailsBeforeStop) {
+      const ReadingListEntry* entry = reading_list_model_->GetEntryByURL(url);
+      if (entry)
+        UMA_HISTOGRAM_COUNTS_100("ReadingList.Download.Failures",
+                                 entry->FailedDownloadCounter());
+      UMA_HISTOGRAM_ENUMERATION("ReadingList.Download.Status", SUCCESS,
+                                STATUS_MAX);
+      break;
+    }
+    case URLDownloader::ERROR: {
+      const ReadingListEntry* entry = reading_list_model_->GetEntryByURL(url);
+      // Add this failure to the total failure count.
+      if (entry &&
+          entry->FailedDownloadCounter() + 1 < kNumberOfFailsBeforeStop) {
+        reading_list_model_->SetEntryDistilledState(
+            url, ReadingListEntry::WILL_RETRY);
+        ScheduleDownloadEntry(url);
         UMA_HISTOGRAM_ENUMERATION("ReadingList.Download.Status", RETRY,
                                   STATUS_MAX);
       } else {
         UMA_HISTOGRAM_ENUMERATION("ReadingList.Download.Status", FAILURE,
                                   STATUS_MAX);
+        reading_list_model_->SetEntryDistilledState(url,
+                                                    ReadingListEntry::ERROR);
       }
+      break;
     }
-
-  } else if (success == URLDownloader::ERROR_PERMANENT) {
-    reading_list_model_->SetEntryDistilledState(url, ReadingListEntry::ERROR);
-    UMA_HISTOGRAM_ENUMERATION("ReadingList.Download.Status", FAILURE,
-                              STATUS_MAX);
   }
 }
 
 void ReadingListDownloadService::OnDeleteEnd(const GURL& url, bool success) {
   // Nothing to update as this is only called when deleting reading list entries
 }
 
 void ReadingListDownloadService::OnConnectionTypeChanged(
     net::NetworkChangeNotifier::ConnectionType type) {
   if (type == net::NetworkChangeNotifier::CONNECTION_NONE) {
     had_connection_ = false;
     return;
   }
 
   if (!had_connection_) {
     had_connection_ = true;
     for (auto& url : url_to_download_cellular_) {
       ScheduleDownloadEntry(url);
     }
   }
   if (type == net::NetworkChangeNotifier::CONNECTION_WIFI) {
     for (auto& url : url_to_download_wifi_) {
       ScheduleDownloadEntry(url);
     }
   }
 }