Index: content/browser/service_worker/service_worker_url_request_job_unittest.cc |
diff --git a/content/browser/service_worker/service_worker_url_request_job_unittest.cc b/content/browser/service_worker/service_worker_url_request_job_unittest.cc |
index 88ed182f957356a8b19f540798cdc7bc0e8bcb50..b4591688eddd7e346eda383440aabf3124708cb5 100644 |
--- a/content/browser/service_worker/service_worker_url_request_job_unittest.cc |
+++ b/content/browser/service_worker/service_worker_url_request_job_unittest.cc |
@@ -350,7 +350,7 @@ TEST_P(ServiceWorkerURLRequestJobTestP, Simple) { |
ASSERT_TRUE(info); |
EXPECT_TRUE(info->was_fetched_via_service_worker()); |
EXPECT_FALSE(info->was_fallback_required()); |
- EXPECT_EQ(GURL(), info->original_url_via_service_worker()); |
+ EXPECT_EQ(0u, info->url_list_via_service_worker().size()); |
EXPECT_EQ(blink::WebServiceWorkerResponseTypeDefault, |
info->response_type_via_service_worker()); |
EXPECT_FALSE(info->service_worker_start_time().is_null()); |
@@ -375,12 +375,14 @@ class ProviderDeleteHelper : public EmbeddedWorkerTestHelper { |
embedded_worker_id, fetch_event_id, |
SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE, |
ServiceWorkerResponse( |
- GURL(), 200, "OK", blink::WebServiceWorkerResponseTypeDefault, |
- ServiceWorkerHeaderMap(), std::string(), 0, GURL(), |
- blink::WebServiceWorkerResponseErrorUnknown, base::Time(), |
+ base::MakeUnique<std::vector<GURL>>(), 200, "OK", |
+ blink::WebServiceWorkerResponseTypeDefault, |
+ base::MakeUnique<ServiceWorkerHeaderMap>(), std::string(), 0, |
+ GURL(), blink::WebServiceWorkerResponseErrorUnknown, base::Time(), |
false /* response_is_in_cache_storage */, |
std::string() /* response_cache_storage_cache_name */, |
- ServiceWorkerHeaderList() /* cors_exposed_header_names */), |
+ base::MakeUnique< |
+ ServiceWorkerHeaderList>() /* cors_exposed_header_names */), |
base::Time::Now())); |
callback.Run(SERVICE_WORKER_OK, base::Time::Now()); |
} |
@@ -405,7 +407,7 @@ TEST_P(ServiceWorkerURLRequestJobTestP, DeletedProviderHostOnFetchEvent) { |
ASSERT_TRUE(info); |
EXPECT_TRUE(info->was_fetched_via_service_worker()); |
EXPECT_FALSE(info->was_fallback_required()); |
- EXPECT_EQ(GURL(), info->original_url_via_service_worker()); |
+ EXPECT_EQ(0u, info->url_list_via_service_worker().size()); |
EXPECT_EQ(blink::WebServiceWorkerResponseTypeDefault, |
info->response_type_via_service_worker()); |
EXPECT_FALSE(info->service_worker_start_time().is_null()); |
@@ -432,7 +434,7 @@ TEST_P(ServiceWorkerURLRequestJobTestP, DeletedProviderHostBeforeFetchEvent) { |
ASSERT_TRUE(info); |
EXPECT_TRUE(info->was_fetched_via_service_worker()); |
EXPECT_FALSE(info->was_fallback_required()); |
- EXPECT_EQ(GURL(), info->original_url_via_service_worker()); |
+ EXPECT_EQ(0u, info->url_list_via_service_worker().size()); |
EXPECT_EQ(blink::WebServiceWorkerResponseTypeDefault, |
info->response_type_via_service_worker()); |
EXPECT_TRUE(info->service_worker_start_time().is_null()); |
@@ -458,12 +460,14 @@ class BlobResponder : public EmbeddedWorkerTestHelper { |
embedded_worker_id, fetch_event_id, |
SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE, |
ServiceWorkerResponse( |
- GURL(), 200, "OK", blink::WebServiceWorkerResponseTypeDefault, |
- ServiceWorkerHeaderMap(), blob_uuid_, blob_size_, GURL(), |
- blink::WebServiceWorkerResponseErrorUnknown, base::Time(), |
+ base::MakeUnique<std::vector<GURL>>(), 200, "OK", |
+ blink::WebServiceWorkerResponseTypeDefault, |
+ base::MakeUnique<ServiceWorkerHeaderMap>(), blob_uuid_, blob_size_, |
+ GURL(), blink::WebServiceWorkerResponseErrorUnknown, base::Time(), |
false /* response_is_in_cache_storage */, |
std::string() /* response_cache_storage_cache_name */, |
- ServiceWorkerHeaderList() /* cors_exposed_header_names */), |
+ base::MakeUnique< |
+ ServiceWorkerHeaderList>() /* cors_exposed_header_names */), |
base::Time::Now())); |
callback.Run(SERVICE_WORKER_OK, base::Time::Now()); |
} |
@@ -498,7 +502,7 @@ TEST_P(ServiceWorkerURLRequestJobTestP, BlobResponse) { |
ASSERT_TRUE(info); |
EXPECT_TRUE(info->was_fetched_via_service_worker()); |
EXPECT_FALSE(info->was_fallback_required()); |
- EXPECT_EQ(GURL(), info->original_url_via_service_worker()); |
+ EXPECT_EQ(0u, info->url_list_via_service_worker().size()); |
EXPECT_EQ(blink::WebServiceWorkerResponseTypeDefault, |
info->response_type_via_service_worker()); |
EXPECT_FALSE(info->service_worker_start_time().is_null()); |
@@ -517,7 +521,7 @@ TEST_P(ServiceWorkerURLRequestJobTestP, NonExistentBlobUUIDResponse) { |
ASSERT_TRUE(info); |
EXPECT_TRUE(info->was_fetched_via_service_worker()); |
EXPECT_FALSE(info->was_fallback_required()); |
- EXPECT_EQ(GURL(), info->original_url_via_service_worker()); |
+ EXPECT_EQ(0u, info->url_list_via_service_worker().size()); |
EXPECT_EQ(blink::WebServiceWorkerResponseTypeDefault, |
info->response_type_via_service_worker()); |
EXPECT_FALSE(info->service_worker_start_time().is_null()); |
@@ -541,12 +545,14 @@ class StreamResponder : public EmbeddedWorkerTestHelper { |
embedded_worker_id, fetch_event_id, |
SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE, |
ServiceWorkerResponse( |
- GURL(), 200, "OK", blink::WebServiceWorkerResponseTypeDefault, |
- ServiceWorkerHeaderMap(), "", 0, stream_url_, |
+ base::MakeUnique<std::vector<GURL>>(), 200, "OK", |
+ blink::WebServiceWorkerResponseTypeDefault, |
+ base::MakeUnique<ServiceWorkerHeaderMap>(), "", 0, stream_url_, |
blink::WebServiceWorkerResponseErrorUnknown, base::Time(), |
false /* response_is_in_cache_storage */, |
std::string() /* response_cache_storage_cache_name */, |
- ServiceWorkerHeaderList() /* cors_exposed_header_names */), |
+ base::MakeUnique< |
+ ServiceWorkerHeaderList>() /* cors_exposed_header_names */), |
base::Time::Now())); |
callback.Run(SERVICE_WORKER_OK, base::Time::Now()); |
} |
@@ -596,7 +602,7 @@ TEST_P(ServiceWorkerURLRequestJobTestP, StreamResponse) { |
ASSERT_TRUE(info); |
EXPECT_TRUE(info->was_fetched_via_service_worker()); |
EXPECT_FALSE(info->was_fallback_required()); |
- EXPECT_EQ(GURL(), info->original_url_via_service_worker()); |
+ EXPECT_EQ(0u, info->url_list_via_service_worker().size()); |
EXPECT_EQ(blink::WebServiceWorkerResponseTypeDefault, |
info->response_type_via_service_worker()); |
EXPECT_FALSE(info->service_worker_start_time().is_null()); |
@@ -646,7 +652,7 @@ TEST_P(ServiceWorkerURLRequestJobTestP, StreamResponse_DelayedRegistration) { |
ASSERT_TRUE(info); |
EXPECT_TRUE(info->was_fetched_via_service_worker()); |
EXPECT_FALSE(info->was_fallback_required()); |
- EXPECT_EQ(GURL(), info->original_url_via_service_worker()); |
+ EXPECT_EQ(0u, info->url_list_via_service_worker().size()); |
EXPECT_EQ(blink::WebServiceWorkerResponseTypeDefault, |
info->response_type_via_service_worker()); |
EXPECT_FALSE(info->service_worker_start_time().is_null()); |
@@ -694,7 +700,7 @@ TEST_P(ServiceWorkerURLRequestJobTestP, StreamResponse_QuickFinalize) { |
ASSERT_TRUE(info); |
EXPECT_TRUE(info->was_fetched_via_service_worker()); |
EXPECT_FALSE(info->was_fallback_required()); |
- EXPECT_EQ(GURL(), info->original_url_via_service_worker()); |
+ EXPECT_EQ(0u, info->url_list_via_service_worker().size()); |
EXPECT_EQ(blink::WebServiceWorkerResponseTypeDefault, |
info->response_type_via_service_worker()); |
EXPECT_FALSE(info->service_worker_start_time().is_null()); |
@@ -743,7 +749,7 @@ TEST_P(ServiceWorkerURLRequestJobTestP, StreamResponse_Flush) { |
ASSERT_TRUE(info); |
EXPECT_TRUE(info->was_fetched_via_service_worker()); |
EXPECT_FALSE(info->was_fallback_required()); |
- EXPECT_EQ(GURL(), info->original_url_via_service_worker()); |
+ EXPECT_EQ(0u, info->url_list_via_service_worker().size()); |
EXPECT_EQ(blink::WebServiceWorkerResponseTypeDefault, |
info->response_type_via_service_worker()); |
EXPECT_FALSE(info->service_worker_start_time().is_null()); |
@@ -796,7 +802,7 @@ TEST_P(ServiceWorkerURLRequestJobTestP, StreamResponseAndCancel) { |
ASSERT_TRUE(info); |
EXPECT_TRUE(info->was_fetched_via_service_worker()); |
EXPECT_FALSE(info->was_fallback_required()); |
- EXPECT_EQ(GURL(), info->original_url_via_service_worker()); |
+ EXPECT_EQ(0u, info->url_list_via_service_worker().size()); |
EXPECT_EQ(blink::WebServiceWorkerResponseTypeDefault, |
info->response_type_via_service_worker()); |
EXPECT_FALSE(info->service_worker_start_time().is_null()); |
@@ -908,7 +914,7 @@ TEST_P(ServiceWorkerURLRequestJobTestP, MainScriptHTTPResponseInfoNotSet) { |
ASSERT_TRUE(info); |
EXPECT_TRUE(info->was_fetched_via_service_worker()); |
EXPECT_FALSE(info->was_fallback_required()); |
- EXPECT_EQ(GURL(), info->original_url_via_service_worker()); |
+ EXPECT_EQ(0u, info->url_list_via_service_worker().size()); |
EXPECT_EQ(blink::WebServiceWorkerResponseTypeDefault, |
info->response_type_via_service_worker()); |
EXPECT_FALSE(info->service_worker_start_time().is_null()); |
@@ -968,12 +974,14 @@ class EarlyResponseHelper : public EmbeddedWorkerTestHelper { |
embedded_worker_id, fetch_event_id, |
SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE, |
ServiceWorkerResponse( |
- GURL(), 200, "OK", blink::WebServiceWorkerResponseTypeDefault, |
- ServiceWorkerHeaderMap(), std::string(), 0, GURL(), |
- blink::WebServiceWorkerResponseErrorUnknown, base::Time(), |
+ base::MakeUnique<std::vector<GURL>>(), 200, "OK", |
+ blink::WebServiceWorkerResponseTypeDefault, |
+ base::MakeUnique<ServiceWorkerHeaderMap>(), std::string(), 0, |
+ GURL(), blink::WebServiceWorkerResponseErrorUnknown, base::Time(), |
false /* response_is_in_cache_storage */, |
std::string() /* response_cache_storage_cache_name */, |
- ServiceWorkerHeaderList() /* cors_exposed_header_names */), |
+ base::MakeUnique< |
+ ServiceWorkerHeaderList>() /* cors_exposed_header_names */), |
base::Time::Now())); |
} |
@@ -997,7 +1005,7 @@ TEST_P(ServiceWorkerURLRequestJobTestP, EarlyResponse) { |
ASSERT_TRUE(info); |
EXPECT_TRUE(info->was_fetched_via_service_worker()); |
EXPECT_FALSE(info->was_fallback_required()); |
- EXPECT_EQ(GURL(), info->original_url_via_service_worker()); |
+ EXPECT_EQ(0u, info->url_list_via_service_worker().size()); |
EXPECT_EQ(blink::WebServiceWorkerResponseTypeDefault, |
info->response_type_via_service_worker()); |
EXPECT_FALSE(info->service_worker_start_time().is_null()); |
@@ -1022,12 +1030,14 @@ class DelayedResponseHelper : public EmbeddedWorkerTestHelper { |
embedded_worker_id_, fetch_event_id_, |
SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE, |
ServiceWorkerResponse( |
- GURL(), 200, "OK", blink::WebServiceWorkerResponseTypeDefault, |
- ServiceWorkerHeaderMap(), std::string(), 0, GURL(), |
- blink::WebServiceWorkerResponseErrorUnknown, base::Time(), |
+ base::MakeUnique<std::vector<GURL>>(), 200, "OK", |
+ blink::WebServiceWorkerResponseTypeDefault, |
+ base::MakeUnique<ServiceWorkerHeaderMap>(), std::string(), 0, |
+ GURL(), blink::WebServiceWorkerResponseErrorUnknown, base::Time(), |
false /* response_is_in_cache_storage */, |
std::string() /* response_cache_storage_cache_name */, |
- ServiceWorkerHeaderList() /* cors_exposed_header_names */), |
+ base::MakeUnique< |
+ ServiceWorkerHeaderList>() /* cors_exposed_header_names */), |
base::Time::Now())); |
callback_.Run(SERVICE_WORKER_OK, base::Time::Now()); |
} |