Pass through the response code and headers in Background Fetch

content/browser/background_fetch/background_fetch_service_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 <map>
 #include <memory>
 #include <utility>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 312 matching lines @@
   BackgroundFetchRegistrationId registration_id;
   ASSERT_TRUE(CreateRegistrationId(kExampleTag, &registration_id));
 
   // base::RunLoop that we'll run until the event has been dispatched. If this
   // test times out, it means that the event could not be dispatched.
   base::RunLoop event_dispatched_loop;
   embedded_worker_test_helper()->set_fetched_event_closure(
       event_dispatched_loop.QuitClosure());
 
   std::vector<ServiceWorkerFetchRequest> requests;
+
+  constexpr int kFirstResponseCode = 200;
+  constexpr int kSecondResponseCode = 201;
+
   requests.push_back(CreateRequestWithProvidedResponse(
-      "GET", "https://example.com/funny_cat.txt", 200 /* status_code */,
-      "This text describes a scenario involving a funny cat."));
+      "GET", "https://example.com/funny_cat.txt",
+      TestResponseBuilder(kFirstResponseCode)
+          .SetResponseData(
+              "This text describes a scenario involving a funny cat.")
+          .AddResponseHeader("Content-Type", "text/plain")
+          .AddResponseHeader("X-Cat", "yes")
+          .Build()));
+
   requests.push_back(CreateRequestWithProvidedResponse(
-      "GET", "https://example.com/crazy_cat.txt", 200 /* status_code */,
-      "This text describes another scenario that involves a crazy cat."));
+      "GET", "https://example.com/crazy_cat.txt",
+      TestResponseBuilder(kSecondResponseCode)
+          .SetResponseData(
+              "This text describes another scenario that involves a crazy cat.")
+          .AddResponseHeader("Content-Type", "text/plain")
+          .Build()));
 
   // Create the registration with the given |requests|.
   {
     BackgroundFetchOptions options;
 
     blink::mojom::BackgroundFetchError error;
     BackgroundFetchRegistration registration;
 
     // Create the first registration. This must succeed.
     ASSERT_NO_FATAL_FAILURE(
@@ skipping 10 matching lines @@
   ASSERT_TRUE(embedded_worker_test_helper()->last_fetches().has_value());
 
   std::vector<BackgroundFetchSettledFetch> fetches =
       embedded_worker_test_helper()->last_fetches().value();
   ASSERT_EQ(fetches.size(), requests.size());
 
   for (size_t i = 0; i < fetches.size(); ++i) {
     ASSERT_EQ(fetches[i].request.url, requests[i].url);
     EXPECT_EQ(fetches[i].request.method, requests[i].method);
 
-    EXPECT_EQ(fetches[i].request.url, fetches[i].response.url_list[0]);
+    EXPECT_EQ(fetches[i].response.url_list[0], fetches[i].request.url);
+    EXPECT_EQ(fetches[i].response.response_type,
+              blink::kWebServiceWorkerResponseTypeDefault);
+
+    switch (i) {
+      case 0:
+        EXPECT_EQ(fetches[i].response.status_code, kFirstResponseCode);
+        EXPECT_EQ(fetches[i].response.headers.count("Content-Type"), 1u);
+        EXPECT_EQ(fetches[i].response.headers.count("X-Cat"), 1u);
+        break;
+      case 1:
+        EXPECT_EQ(fetches[i].response.status_code, kSecondResponseCode);
+        EXPECT_EQ(fetches[i].response.headers.count("Content-Type"), 1u);
+        EXPECT_EQ(fetches[i].response.headers.count("X-Cat"), 0u);
+        break;
+      default:
+        NOTREACHED();
+    }
 
     // TODO(peter): change-detector tests for unsupported properties.
-    EXPECT_EQ(fetches[i].response.status_code, 200);
-    EXPECT_TRUE(fetches[i].response.status_text.empty());
-    EXPECT_EQ(fetches[i].response.response_type,
-              blink::kWebServiceWorkerResponseTypeDefault);
-    EXPECT_FALSE(fetches[i].response.headers.empty());
     EXPECT_EQ(fetches[i].response.error,
               blink::kWebServiceWorkerResponseErrorUnknown);
 
     // Verify that all properties have a sensible value.
     EXPECT_FALSE(fetches[i].response.response_time.is_null());
 
     // Verify that the response blobs have been populated. We cannot consume
     // their data here since the handles have already been released.
     ASSERT_FALSE(fetches[i].response.blob_uuid.empty());
     ASSERT_GT(fetches[i].response.blob_size, 0u);
@@ skipping 138 matching lines @@
     const bool has_alternative_tag =
         tags[0] == kAlternativeTag || tags[1] == kAlternativeTag;
 
     EXPECT_TRUE(has_example_tag);
     EXPECT_TRUE(has_alternative_tag);
   }
 }
 
 }  // namespace
 }  // namespace content