[Background Fetch] Tidy up getting/activating pending requests

content/browser/background_fetch/background_fetch_job_controller.h

 // 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.
 
 #ifndef CONTENT_BROWSER_BACKGROUND_FETCH_BACKGROUND_FETCH_JOB_CONTROLLER_H_
 #define CONTENT_BROWSER_BACKGROUND_FETCH_BACKGROUND_FETCH_JOB_CONTROLLER_H_
 
 #include <memory>
 #include <string>
 #include <unordered_map>
@@ skipping 30 matching lines @@
   BackgroundFetchJobController(
       const BackgroundFetchRegistrationId& registration_id,
       const BackgroundFetchOptions& options,
       BackgroundFetchDataManager* data_manager,
       BrowserContext* browser_context,
       scoped_refptr<net::URLRequestContextGetter> request_context,
       CompletedCallback completed_callback,
       const net::NetworkTrafficAnnotationTag& traffic_annotation);
   ~BackgroundFetchJobController();
 
-  // Starts fetching the |initial_fetches|. The controller will continue to
+  // Starts fetching the first few requests. The controller will continue to
   // fetch new content until all requests have been handled.
-  void Start(
-      std::vector<scoped_refptr<BackgroundFetchRequestInfo>> initial_requests);
+  void Start();
 
   // Updates the representation of this Background Fetch in the user interface
   // to match the given |title|.
   void UpdateUI(const std::string& title);
 
   // Immediately aborts this Background Fetch by request of the developer.
   void Abort();
 
   // Returns the current state of this Job Controller.
   State state() const { return state_; }
@@ skipping 13 matching lines @@
   void StartRequest(scoped_refptr<BackgroundFetchRequestInfo> request);
 
   // Called when the given |request| has started fetching, after having been
   // assigned the |download_guid| by the download system.
   void DidStartRequest(scoped_refptr<BackgroundFetchRequestInfo> request,
                        const std::string& download_guid);
 
   // Called when the given |request| has been completed.
   void DidCompleteRequest(scoped_refptr<BackgroundFetchRequestInfo> request);
 
-  // Called when a completed download has been marked as such in the DataManager
-  // and the next request, if any, has been read from storage.
-  void DidGetNextRequest(scoped_refptr<BackgroundFetchRequestInfo> request);
+  // Called when a completed download has been marked as such in DataManager.
+  void DidMarkRequestCompleted(bool has_pending_or_active_requests);
 
   // The registration id on behalf of which this controller is fetching data.
   BackgroundFetchRegistrationId registration_id_;
 
   // Options for the represented background fetch registration.
   BackgroundFetchOptions options_;
 
   // The current state of this Job Controller.
   State state_ = State::INITIALIZED;
 
   // Inner core of this job controller which lives on the UI thread.
   std::unique_ptr<Core, BrowserThread::DeleteOnUIThread> ui_core_;
   base::WeakPtr<Core> ui_core_ptr_;
 
   // The DataManager's lifetime is controlled by the BackgroundFetchContext and
   // will be kept alive until after the JobController is destroyed.
   BackgroundFetchDataManager* data_manager_;
 
-  // Number of outstanding acknowledgements we still expect to receive.
-  int pending_completed_file_acknowledgements_ = 0;
-
   // Callback for when all fetches have been completed.
   CompletedCallback completed_callback_;
 
   // Traffic annotation for network request.
   const net::NetworkTrafficAnnotationTag traffic_annotation_;
 
   base::WeakPtrFactory<BackgroundFetchJobController> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BackgroundFetchJobController);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_BACKGROUND_FETCH_BACKGROUND_FETCH_JOB_CONTROLLER_H_