Add the JobComplete callback and error/interrupt information

content/browser/background_fetch/background_fetch_job_controller.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_controller.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "content/browser/background_fetch/background_fetch_job_data.h"
 #include "content/browser/background_fetch/background_fetch_request_info.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/storage_partition.h"
 
 namespace content {
 
 BackgroundFetchJobController::BackgroundFetchJobController(
     const std::string& job_guid,
     BrowserContext* browser_context,
     StoragePartition* storage_partition,
-    std::unique_ptr<BackgroundFetchJobData> job_data)
+    std::unique_ptr<BackgroundFetchJobData> job_data,
+    base::OnceClosure completed_closure)
     : browser_context_(browser_context),
       storage_partition_(storage_partition),
       job_data_(std::move(job_data)),
+      completed_closure_(std::move(completed_closure)),
       weak_ptr_factory_(this) {}
 
 BackgroundFetchJobController::~BackgroundFetchJobController() = default;
 
 void BackgroundFetchJobController::Shutdown() {
   DownloadManager* manager =
       BrowserContext::GetDownloadManager(browser_context_);
   // For any downloads in progress, remove the observer.
   for (auto& guid_map_entry : download_guid_map_) {
     DownloadItem* item = manager->GetDownloadByGuid(guid_map_entry.first);
@@ skipping 21 matching lines @@
 
 void BackgroundFetchJobController::DownloadStarted(
     const std::string& request_guid,
     DownloadItem* item,
     DownloadInterruptReason reason) {
   // Start observing the DownloadItem. No need to store the pointer because it
   // can be retrieved from the DownloadManager.
   item->AddObserver(this);
   download_guid_map_[item->GetGuid()] = request_guid;
   job_data_->SetRequestDownloadGuid(request_guid, item->GetGuid());
+
+  // TODO(harkness): If DownloadStarted is called with a real interrupt reason,
+  // record that and don't mark it as in-progress.
 }
 
 void BackgroundFetchJobController::OnDownloadUpdated(DownloadItem* item) {
   DCHECK(download_guid_map_.find(item->GetGuid()) != download_guid_map_.end());
 
-  bool requests_remaining = false;
+  // Update the state of the request on the JobData. If the state is a final
+  // state, this will also update the complete status of the JobData.
+  bool requests_remaining = job_data_->UpdateBackgroundFetchRequestState(
+      download_guid_map_[item->GetGuid()], item->GetState(),
+      item->GetLastReason());
+
   switch (item->GetState()) {
     case DownloadItem::DownloadState::CANCELLED:
-    // TODO(harkness): Expand the "complete" flag on the RequestInfo to
-    // include error states.
     case DownloadItem::DownloadState::COMPLETE:
-      requests_remaining = job_data_->BackgroundFetchRequestInfoComplete(
-          download_guid_map_[item->GetGuid()]);
       // TODO(harkness): Tell the notification service to update the download
       // notification.
 
       if (requests_remaining) {
         ProcessRequest(job_data_->GetNextBackgroundFetchRequestInfo());
       } else if (job_data_->IsComplete()) {
-        // TODO(harkness): Return the data to the context.
+        std::move(completed_closure_).Run();
       }
       break;
     case DownloadItem::DownloadState::INTERRUPTED:
       // TODO(harkness): Just update the notification that it is paused.
       break;
     case DownloadItem::DownloadState::IN_PROGRESS:
       // TODO(harkness): If the download was previously paused, this should now
       // unpause the notification.
       break;
     case DownloadItem::DownloadState::MAX_DOWNLOAD_STATE:
@@ skipping 18 matching lines @@
           fetch_request.url(), storage_partition_->GetURLRequestContext()));
   params->set_callback(
       base::Bind(&BackgroundFetchJobController::DownloadStarted,
                  weak_ptr_factory_.GetWeakPtr(), fetch_request.guid()));
 
   BrowserContext::GetDownloadManager(browser_context_)
       ->DownloadUrl(std::move(params));
 }
 
 }  // namespace content