Add the JobComplete callback and error/interrupt information

content/browser/background_fetch/background_fetch_job_data.cc

 // Copyright 2017 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 "content/browser/background_fetch/background_fetch_job_data.h"
 
 #include "base/memory/ptr_util.h"
 #include "content/browser/background_fetch/background_fetch_job_info.h"
 
 namespace content {
 
 BackgroundFetchJobData::BackgroundFetchJobData(
     BackgroundFetchRequestInfos& request_infos)
     : request_infos_(request_infos) {}
 
 BackgroundFetchJobData::~BackgroundFetchJobData() {}
 
-// TODO(harkness): Provide more detail about status and where the returned data
-// is now available.
-bool BackgroundFetchJobData::BackgroundFetchRequestInfoComplete(
-    const std::string& fetch_guid) {
+bool BackgroundFetchJobData::UpdateBackgroundFetchRequestState(
+    const std::string& fetch_guid,
+    DownloadItem::DownloadState state,
+    DownloadInterruptReason interrupt_reason) {
   // Make sure that the request was expected to be in-progress.
   auto index_iter = request_info_index_.find(fetch_guid);
   DCHECK(index_iter != request_info_index_.end());
   DCHECK_EQ(fetch_guid, request_infos_[index_iter->second].guid());
 
-  // Set the request as complete and delete it from the in-progress index.
-  request_infos_[index_iter->second].set_complete(true);
-  request_info_index_.erase(index_iter);
+  // Set the state of the request and the interrupt reason.
+  request_infos_[index_iter->second].set_state(state);
+  request_infos_[index_iter->second].set_interrupt_reason(interrupt_reason);
+
+  // If the new state is complete or cancelled, remove the in-progress request.
+  if ((state == DownloadItem::DownloadState::COMPLETE) ||
+      (state == DownloadItem::DownloadState::CANCELLED)) {

[Peter Beverloo, 2017/03/16 12:37:10]

Could we have a switch() w/o a default: state to protect ourselves from
forgetting to update code if a new state is added? :)

[harkness, 2017/03/17 11:14:11]

Done.

+    request_info_index_.erase(index_iter);
+  }
 
   // Return a boolean indicating whether there are more requests to be
   // processed.
   return next_request_info_ != request_infos_.size();
 }
 
 const BackgroundFetchRequestInfo&
 BackgroundFetchJobData::GetNextBackgroundFetchRequestInfo() {
   DCHECK(next_request_info_ != request_infos_.size());
 
   const BackgroundFetchRequestInfo& next_request =
       request_infos_[next_request_info_];
-  DCHECK(!next_request.complete());
+  DCHECK_EQ(next_request.state(),
+            DownloadItem::DownloadState::MAX_DOWNLOAD_STATE);
   request_info_index_[next_request.guid()] = next_request_info_++;
 
   return next_request;
 }
 
 bool BackgroundFetchJobData::IsComplete() const {
   return ((next_request_info_ == request_infos_.size()) &&
           request_info_index_.empty());
 }
 
 bool BackgroundFetchJobData::HasRequestsRemaining() const {
   return next_request_info_ != request_infos_.size();
 }
 
 void BackgroundFetchJobData::SetRequestDownloadGuid(
     const std::string& request_guid,
     const std::string& download_guid) {
   auto index_iter = request_info_index_.find(request_guid);
   DCHECK(index_iter != request_info_index_.end());
   request_infos_[index_iter->second].set_download_guid(download_guid);
 }
 }  // namespace content