Make the BackgroundFetchJobController a per-job object

content/browser/background_fetch/background_fetch_context.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_CONTEXT_H_
 #define CONTENT_BROWSER_BACKGROUND_FETCH_BACKGROUND_FETCH_CONTEXT_H_
 
+#include <unordered_map>
+
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "content/browser/background_fetch/background_fetch_data_manager.h"
 #include "content/browser/background_fetch/background_fetch_job_controller.h"
 #include "content/common/content_export.h"
 
 namespace content {
 
 class BackgroundFetchJobInfo;
 class BackgroundFetchRequestInfo;
@@ skipping 22 matching lines @@
   void Shutdown();
 
   BackgroundFetchDataManager* GetDataManagerForTesting() {
     return &background_fetch_data_manager_;
   }
 
  private:
   void CreateRequest(const BackgroundFetchJobInfo& job_info,
                      std::vector<BackgroundFetchRequestInfo>& request_infos);
 
+  void ShutdownOnIO();
+
   friend class base::RefCountedThreadSafe<BackgroundFetchContext>;
   ~BackgroundFetchContext();
 
+  // The Context is owned by the BrowserContext via the StoragePartition.

[Peter Beverloo, 2017/03/08 14:27:04]

Maybe s/The Context/|this|/ to remove ambiguity between "Context" and
"BrowserContext" on the line below, since they align nearly perfectly?

[harkness, 2017/03/09 13:33:25]

Good point! Done.

+  BrowserContext* browser_context_;
+  StoragePartition* storage_partition_;
+
   scoped_refptr<ServiceWorkerContextWrapper> service_worker_context_;
-  BackgroundFetchJobController background_fetch_job_controller_;
   BackgroundFetchDataManager background_fetch_data_manager_;
 
+  std::unordered_map<std::string, std::unique_ptr<BackgroundFetchJobController>>
+      job_map_;
+
   DISALLOW_COPY_AND_ASSIGN(BackgroundFetchContext);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_BACKGROUND_FETCH_BACKGROUND_FETCH_CONTEXT_H_