OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/browser/service_worker/service_worker_url_request_job.h" | 5 #include "content/browser/service_worker/service_worker_url_request_job.h" |
6 | 6 |
7 #include <stdint.h> | 7 #include <stdint.h> |
8 #include <utility> | 8 #include <utility> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
164 net::URLRequest* request, | 164 net::URLRequest* request, |
165 net::NetworkDelegate* network_delegate) const override { | 165 net::NetworkDelegate* network_delegate) const override { |
166 if (job_ && job_->ShouldFallbackToNetwork()) { | 166 if (job_ && job_->ShouldFallbackToNetwork()) { |
167 // Simulate fallback to network by constructing a valid response. | 167 // Simulate fallback to network by constructing a valid response. |
168 return new net::URLRequestTestJob(request, network_delegate, | 168 return new net::URLRequestTestJob(request, network_delegate, |
169 net::URLRequestTestJob::test_headers(), | 169 net::URLRequestTestJob::test_headers(), |
170 "PASS", true); | 170 "PASS", true); |
171 } | 171 } |
172 | 172 |
173 job_ = new ServiceWorkerURLRequestJob( | 173 job_ = new ServiceWorkerURLRequestJob( |
174 request, network_delegate, blob_storage_context_, resource_context_, | 174 request, network_delegate, provider_host_->client_uuid(), |
175 FETCH_REQUEST_MODE_NO_CORS, FETCH_CREDENTIALS_MODE_OMIT, | 175 blob_storage_context_, resource_context_, FETCH_REQUEST_MODE_NO_CORS, |
176 FetchRedirectMode::FOLLOW_MODE, true /* is_main_resource_load */, | 176 FETCH_CREDENTIALS_MODE_OMIT, FetchRedirectMode::FOLLOW_MODE, |
177 REQUEST_CONTEXT_TYPE_HYPERLINK, REQUEST_CONTEXT_FRAME_TYPE_TOP_LEVEL, | 177 true /* is_main_resource_load */, REQUEST_CONTEXT_TYPE_HYPERLINK, |
| 178 REQUEST_CONTEXT_FRAME_TYPE_TOP_LEVEL, |
178 scoped_refptr<ResourceRequestBody>(), delegate_); | 179 scoped_refptr<ResourceRequestBody>(), delegate_); |
179 job_->ForwardToServiceWorker(); | 180 job_->ForwardToServiceWorker(); |
180 return job_; | 181 return job_; |
181 } | 182 } |
182 | 183 |
183 private: | 184 private: |
184 base::WeakPtr<ServiceWorkerProviderHost> provider_host_; | 185 base::WeakPtr<ServiceWorkerProviderHost> provider_host_; |
185 const ResourceContext* resource_context_; | 186 const ResourceContext* resource_context_; |
186 base::WeakPtr<storage::BlobStorageContext> blob_storage_context_; | 187 base::WeakPtr<storage::BlobStorageContext> blob_storage_context_; |
187 mutable ServiceWorkerURLRequestJob* job_; | 188 mutable ServiceWorkerURLRequestJob* job_; |
(...skipping 739 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
927 EXPECT_EQ(blink::WebServiceWorkerResponseTypeDefault, | 928 EXPECT_EQ(blink::WebServiceWorkerResponseTypeDefault, |
928 callback_tracker_.response_type_via_service_worker()); | 929 callback_tracker_.response_type_via_service_worker()); |
929 EXPECT_FALSE(callback_tracker_.service_worker_start_time().is_null()); | 930 EXPECT_FALSE(callback_tracker_.service_worker_start_time().is_null()); |
930 EXPECT_FALSE(callback_tracker_.service_worker_ready_time().is_null()); | 931 EXPECT_FALSE(callback_tracker_.service_worker_ready_time().is_null()); |
931 } | 932 } |
932 | 933 |
933 // TODO(kinuko): Add more tests with different response data and also for | 934 // TODO(kinuko): Add more tests with different response data and also for |
934 // FallbackToNetwork case. | 935 // FallbackToNetwork case. |
935 | 936 |
936 } // namespace content | 937 } // namespace content |
OLD | NEW |