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

content/browser/background_fetch/background_fetch_job_controller_unittest.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 <vector>
 
 #include "base/bind_helpers.h"
@@ skipping 134 matching lines @@
 
   void SetUp() override {
     // The download_manager_ ownership is given to the BrowserContext, and the
     // BrowserContext will take care of deallocating it.
     BrowserContext::SetDownloadManagerForTesting(&browser_context_,
                                                  download_manager_);
   }
 
   void TearDown() override { job_controller_->Shutdown(); }
 
-  void InitializeJobController() {
+  void InitializeJobController(
+      const BackgroundFetchRegistrationId& registration_id) {
     job_controller_ = base::MakeUnique<BackgroundFetchJobController>(
-        kJobGuid, &browser_context_,
+        registration_id, &browser_context_,
         BrowserContext::GetDefaultStoragePartition(&browser_context_),
         data_manager_.get(),
         base::BindOnce(&BackgroundFetchJobControllerTest::DidCompleteJob,
                        base::Unretained(this)));
   }
 
-  void DidCompleteJob() { did_complete_job_ = true; }
+  void DidCompleteJob(const BackgroundFetchRegistrationId& registration_id) {
+    did_complete_job_ = true;

[harkness, 2017/03/27 15:35:12]

optional: DCHECK that registration_id is equal to the id passed into
InitializeJobController?

[Peter Beverloo, 2017/03/27 15:42:55]

Done.

+  }
 
   void StartProcessing() {
     base::RunLoop run_loop;
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&BackgroundFetchJobControllerTest::StartProcessingOnIO,
                    base::Unretained(this), run_loop.QuitClosure()));
     run_loop.Run();
   }
 
@@ skipping 20 matching lines @@
  private:
   bool did_complete_job_ = false;
   TestBrowserThreadBundle thread_bundle_;
   TestBrowserContext browser_context_;
   std::unique_ptr<FakeBackgroundFetchDataManager> data_manager_;
   std::unique_ptr<BackgroundFetchJobController> job_controller_;
   MockDownloadManagerWithCallback* download_manager_;
 };
 
 TEST_F(BackgroundFetchJobControllerTest, SingleRequestJob) {
-  BackgroundFetchJobInfo job_info(kTag, url::Origin(GURL(kOrigin)),
-                                  kServiceWorkerRegistrationId);
+  BackgroundFetchRegistrationId registration_id(
+      kServiceWorkerRegistrationId, url::Origin(GURL(kOrigin)), kTag);
+
   BackgroundFetchRequestInfo request_info(GURL(kTestUrl), kJobGuid);
   request_info.set_state(DownloadItem::DownloadState::IN_PROGRESS);
   data_manager()->set_next_request(&request_info);
-  InitializeJobController();
+  InitializeJobController(registration_id);
 
   EXPECT_CALL(*(download_manager()),
               DownloadUrlMock(::testing::Pointee(::testing::Property(
                   &DownloadUrlParameters::url, GURL(kTestUrl)))))
       .Times(1);
 
   StartProcessing();
 
   // Get the pending download from the download manager.
   auto& download_items = download_manager()->download_items();
   ASSERT_EQ(1U, download_items.size());
   FakeDownloadItem* item = download_items[0].get();
 
   // Update the observer with no actual change.
   ItemObserver()->OnDownloadUpdated(item);
   EXPECT_EQ(DownloadItem::DownloadState::IN_PROGRESS, request_info.state());
   EXPECT_FALSE(did_complete_job());
 
   // Update the item to be completed then update the observer. The JobController
   // should update the JobData that the request is complete.
   item->SetState(DownloadItem::DownloadState::COMPLETE);
   ItemObserver()->OnDownloadUpdated(item);
 
   EXPECT_EQ(DownloadItem::DownloadState::COMPLETE, request_info.state());
   EXPECT_TRUE(did_complete_job());
 }
 
 TEST_F(BackgroundFetchJobControllerTest, MultipleRequestJob) {
-  BackgroundFetchJobInfo job_info(kTag, url::Origin(GURL(kOrigin)),
-                                  kServiceWorkerRegistrationId);
+  BackgroundFetchRegistrationId registration_id(
+      kServiceWorkerRegistrationId, url::Origin(GURL(kOrigin)), kTag);
+
   std::vector<BackgroundFetchRequestInfo> request_infos;
   for (int i = 0; i < 10; i++) {
     request_infos.emplace_back(GURL(kTestUrl), base::IntToString(i));
   }
   data_manager()->set_next_request(&request_infos[0]);
-  InitializeJobController();
+  InitializeJobController(registration_id);
 
   EXPECT_CALL(*(download_manager()),
               DownloadUrlMock(::testing::Pointee(::testing::Property(
                   &DownloadUrlParameters::url, GURL(kTestUrl)))))
       .Times(10);
 
   StartProcessing();
 
   // Get one of the pending downloads from the download manager.
   auto& download_items = download_manager()->download_items();
@@ skipping 23 matching lines @@
   // see that there are no more requests and mark the job as done.
   ASSERT_EQ(10U, download_items.size());
   item = download_items[9].get();
   item->SetState(DownloadItem::DownloadState::COMPLETE);
   ItemObserver()->OnDownloadUpdated(item);
 
   EXPECT_TRUE(did_complete_job());
 }
 
 TEST_F(BackgroundFetchJobControllerTest, UpdateStorageState) {
-  BackgroundFetchJobInfo job_info(kTag, url::Origin(GURL(kOrigin)),
-                                  kServiceWorkerRegistrationId);
+  BackgroundFetchRegistrationId registration_id(
+      kServiceWorkerRegistrationId, url::Origin(GURL(kOrigin)), kTag);
+
   BackgroundFetchRequestInfo request_info(GURL(kTestUrl), kJobGuid);
   request_info.set_state(DownloadItem::DownloadState::IN_PROGRESS);
   data_manager()->set_next_request(&request_info);
-  InitializeJobController();
+  InitializeJobController(registration_id);
 
   EXPECT_CALL(*(download_manager()),
               DownloadUrlMock(::testing::Pointee(::testing::Property(
                   &DownloadUrlParameters::url, GURL(kTestUrl)))))
       .Times(1);
 
   StartProcessing();
 
   // Get the pending download from the download manager.
   auto& download_items = download_manager()->download_items();
   ASSERT_EQ(1U, download_items.size());
   FakeDownloadItem* item = download_items[0].get();
 
   item->SetTargetFilePath(base::FilePath(kFileName));
   item->SetReceivedBytes(123);
   item->SetState(DownloadItem::DownloadState::COMPLETE);
 
   // Trigger the observer. The JobController should update the JobData that the
   // request is complete and should fill in storage state.
   ItemObserver()->OnDownloadUpdated(item);
 
   EXPECT_EQ(123, request_info.received_bytes());
   EXPECT_TRUE(data_manager()->IsComplete(kJobGuid));
   EXPECT_TRUE(did_complete_job());
 }
 
 }  // namespace content