Hook up BackgroundFetchServiceImpl::Fetch() to start a fetch

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/guid.h"
 #include "base/memory/ptr_util.h"
 #include "content/browser/background_fetch/background_fetch_data_manager.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,
+    const BackgroundFetchRegistrationId& registration_id,
     BrowserContext* browser_context,
     StoragePartition* storage_partition,
     BackgroundFetchDataManager* data_manager,
-    base::OnceClosure completed_closure)
-    : job_guid_(job_guid),
+    CompletedCallback completed_callback)
+    : registration_id_(registration_id),
+      job_guid_(base::GenerateGUID()),
       browser_context_(browser_context),
       storage_partition_(storage_partition),
       data_manager_(data_manager),
-      completed_closure_(std::move(completed_closure)),
+      completed_callback_(std::move(completed_callback)),
       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 51 matching lines @@
                                                item->GetReceivedBytes());
     // Fall through.
     case DownloadItem::DownloadState::CANCELLED:
       // TODO(harkness): Tell the notification service to update the download
       // notification.
 
       if (requests_remaining) {
         ProcessRequest(
             data_manager_->GetNextBackgroundFetchRequestInfo(job_guid_));
       } else if (data_manager_->IsComplete(job_guid_)) {
-        std::move(completed_closure_).Run();
+        std::move(completed_callback_).Run(registration_id_);
       }
       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