[Offline Pages] Handle prerender FinalStatus UnsupportedScheme as a cancel rather than failure.

components/offline_pages/background/request_coordinator.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/offline_pages/background/request_coordinator.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 388 matching lines @@
   DCHECK_NE(status, Offliner::RequestStatus::LOADED);
   event_logger_.RecordSavePageRequestUpdated(request.client_id().name_space,
                                              status, request.request_id());
   last_offlining_status_ = status;
   RecordOfflinerResultUMA(request.client_id(), last_offlining_status_);
   watchdog_timer_.Stop();
 
   is_busy_ = false;
   active_request_.reset(nullptr);
 
-  if (status == Offliner::RequestStatus::FOREGROUND_CANCELED) {
+  if (status == Offliner::RequestStatus::FOREGROUND_CANCELED ||
+      status == Offliner::RequestStatus::PRERENDERING_CANCELED) {
     // Update the request for the canceled attempt.
     // TODO(dougarnett): See if we can conclusively identify other attempt
     // aborted cases to treat this way (eg, for Render Process Killed).
     SavePageRequest updated_request(request);
     updated_request.MarkAttemptAborted();
     queue_->UpdateRequest(updated_request,
                           base::Bind(&RequestCoordinator::UpdateRequestCallback,
                                      weak_ptr_factory_.GetWeakPtr(),
                                      updated_request.client_id()));
-    NotifyCompleted(updated_request, SavePageStatus::FOREGROUND_CANCELED);
+    SavePageStatus notify_status =
+        (status == Offliner::RequestStatus::FOREGROUND_CANCELED)
+            ? SavePageStatus::FOREGROUND_CANCELED
+            : SavePageStatus::PRERENDER_CANCELED;
+    NotifyCompleted(updated_request, notify_status);
 
   } else if (status == Offliner::RequestStatus::SAVED) {
     // Remove the request from the queue if it succeeded.
     std::vector<int64_t> remove_requests;
     remove_requests.push_back(request.request_id());
     queue_->RemoveRequests(
         remove_requests,
         base::Bind(&RequestCoordinator::HandleRemovedRequests,
                    weak_ptr_factory_.GetWeakPtr(), SavePageStatus::SUCCESS));
   } else if (request.completed_attempt_count() + 1 >=
@@ skipping 22 matching lines @@
 
   // Determine whether we might try another request in this
   // processing window based on how the previous request completed.
   //
   // TODO(dougarnett): Need to split PRERENDERING_FAILED into separate
   // codes as to whether we should try another request or not.
   switch (status) {
     case Offliner::RequestStatus::SAVED:
     case Offliner::RequestStatus::SAVE_FAILED:
     case Offliner::RequestStatus::REQUEST_COORDINATOR_CANCELED:  // timeout
-    case Offliner::RequestStatus::PRERENDERING_CANCELED:
       // Consider processing another request in this service window.
       TryNextRequest();
       break;
     case Offliner::RequestStatus::FOREGROUND_CANCELED:
+    case Offliner::RequestStatus::PRERENDERING_CANCELED:
     case Offliner::RequestStatus::PRERENDERING_FAILED:
       // No further processing in this service window.
       break;
     default:
       // Make explicit choice about new status codes that actually reach here.
       // Their default is no further processing in this service window.
       DCHECK(false);
   }
 }
 
@@ skipping 28 matching lines @@
   FOR_EACH_OBSERVER(Observer, observers_, OnChanged(request));
 }
 
 void RequestCoordinator::GetOffliner() {
   if (!offliner_) {
     offliner_ = factory_->GetOffliner(policy_.get());
   }
 }
 
 }  // namespace offline_pages