Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(308)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/service_worker/service_worker_url_request_job_unittest.cc

Issue 2516353002: Introduce url_list to the Response scheme of CacheStorage. (Closed)
Patch Set: implicit conversion WebURL <-> GURL and WebVector <- vector Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/service_worker/service_worker_url_request_job.cc ('k') | content/child/web_url_loader_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 f6cca3442fac43b29aacb9cef245938aa517257d..630b018c4e877fee8af37ed3169a8f78222834da 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
@@ -355,7 +355,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());
@@ -393,12 +393,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());
}
@@ -423,7 +425,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());
@@ -450,7 +452,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());
@@ -476,12 +478,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());
}
@@ -516,7 +520,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());
@@ -535,7 +539,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());
@@ -559,12 +563,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());
}
@@ -614,7 +620,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());
@@ -664,7 +670,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());
@@ -712,7 +718,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());
@@ -761,7 +767,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());
@@ -814,7 +820,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());
@@ -926,7 +932,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());
@@ -986,12 +992,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()));
}
@@ -1015,7 +1023,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());
@@ -1040,12 +1048,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());
}
« no previous file with comments | « content/browser/service_worker/service_worker_url_request_job.cc ('k') | content/child/web_url_loader_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698