Start aligning BackgroundFetchRequestInfo with the passed in request object.

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"
 #include "base/callback_helpers.h"
 #include "base/files/file_path.h"
 #include "base/guid.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "content/browser/background_fetch/background_fetch_data_manager.h"
 #include "content/browser/background_fetch/background_fetch_job_info.h"
 #include "content/browser/background_fetch/background_fetch_request_info.h"
+#include "content/common/service_worker/service_worker_types.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/fake_download_item.h"
 #include "content/public/test/mock_download_manager.h"
 #include "content/public/test/test_browser_context.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
 
 namespace {
@@ skipping 174 matching lines @@
   TestBrowserContext browser_context_;
   std::unique_ptr<FakeBackgroundFetchDataManager> data_manager_;
   std::unique_ptr<BackgroundFetchJobController> job_controller_;
   MockDownloadManagerWithCallback* download_manager_;
 };
 
 TEST_F(BackgroundFetchJobControllerTest, SingleRequestJob) {
   BackgroundFetchRegistrationId registration_id(
       kServiceWorkerRegistrationId, url::Origin(GURL(kOrigin)), kTag);
 
-  BackgroundFetchRequestInfo request_info(GURL(kTestUrl), kJobGuid);
+  ServiceWorkerHeaderMap headers;
+  ServiceWorkerFetchRequest request(GURL(kTestUrl), "GET", headers, Referrer(),
+                                    false /* is_reload */);
+  BackgroundFetchRequestInfo request_info(request);
   request_info.set_state(DownloadItem::DownloadState::IN_PROGRESS);
   data_manager()->set_next_request(&request_info);
   InitializeJobController(registration_id);
 
   EXPECT_CALL(*(download_manager()),
               DownloadUrlMock(::testing::Pointee(::testing::Property(
                   &DownloadUrlParameters::url, GURL(kTestUrl)))))
       .Times(1);
 
   StartProcessing();
@@ skipping 16 matching lines @@
   EXPECT_EQ(DownloadItem::DownloadState::COMPLETE, request_info.state());
   EXPECT_TRUE(did_complete_job());
 }
 
 TEST_F(BackgroundFetchJobControllerTest, MultipleRequestJob) {
   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));
+    ServiceWorkerHeaderMap headers;
+    ServiceWorkerFetchRequest request(GURL(kTestUrl), "GET", headers,
+                                      Referrer(), false /* is_reload */);
+    request_infos.emplace_back(request);
   }
   data_manager()->set_next_request(&request_infos[0]);
   InitializeJobController(registration_id);
 
   EXPECT_CALL(*(download_manager()),
               DownloadUrlMock(::testing::Pointee(::testing::Property(
                   &DownloadUrlParameters::url, GURL(kTestUrl)))))
       .Times(10);
 
   StartProcessing();
@@ skipping 29 matching lines @@
   item->SetState(DownloadItem::DownloadState::COMPLETE);
   ItemObserver()->OnDownloadUpdated(item);
 
   EXPECT_TRUE(did_complete_job());
 }
 
 TEST_F(BackgroundFetchJobControllerTest, UpdateStorageState) {
   BackgroundFetchRegistrationId registration_id(
       kServiceWorkerRegistrationId, url::Origin(GURL(kOrigin)), kTag);
 
-  BackgroundFetchRequestInfo request_info(GURL(kTestUrl), kJobGuid);
+  ServiceWorkerHeaderMap headers;
+  ServiceWorkerFetchRequest request(GURL(kTestUrl), "GET", headers, Referrer(),
+                                    false /* is_reload */);
+  BackgroundFetchRequestInfo request_info(request);
   request_info.set_state(DownloadItem::DownloadState::IN_PROGRESS);
   data_manager()->set_next_request(&request_info);
   InitializeJobController(registration_id);
 
   EXPECT_CALL(*(download_manager()),
               DownloadUrlMock(::testing::Pointee(::testing::Property(
                   &DownloadUrlParameters::url, GURL(kTestUrl)))))
       .Times(1);
 
   StartProcessing();
@@ skipping 10 matching lines @@
   // 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