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_request_handler.h" | 5 #include "content/browser/service_worker/service_worker_request_handler.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/run_loop.h" | 9 #include "base/run_loop.h" |
10 #include "content/browser/service_worker/embedded_worker_test_helper.h" | 10 #include "content/browser/service_worker/embedded_worker_test_helper.h" |
11 #include "content/browser/service_worker/service_worker_context_core.h" | 11 #include "content/browser/service_worker/service_worker_context_core.h" |
12 #include "content/browser/service_worker/service_worker_context_wrapper.h" | 12 #include "content/browser/service_worker/service_worker_context_wrapper.h" |
13 #include "content/browser/service_worker/service_worker_provider_host.h" | 13 #include "content/browser/service_worker/service_worker_provider_host.h" |
14 #include "content/browser/service_worker/service_worker_test_utils.h" | 14 #include "content/browser/service_worker/service_worker_test_utils.h" |
15 #include "content/common/resource_request_body_impl.h" | 15 #include "content/common/resource_request_body_impl.h" |
16 #include "content/common/service_worker/service_worker_utils.h" | 16 #include "content/common/service_worker/service_worker_utils.h" |
17 #include "content/public/common/request_context_frame_type.h" | 17 #include "content/public/common/request_context_frame_type.h" |
18 #include "content/public/common/request_context_type.h" | 18 #include "content/public/common/request_context_type.h" |
19 #include "content/public/common/resource_type.h" | 19 #include "content/public/common/resource_type.h" |
20 #include "content/public/test/test_browser_thread_bundle.h" | 20 #include "content/public/test/test_browser_thread_bundle.h" |
| 21 #include "net/traffic_annotation/network_traffic_annotation_test_helper.h" |
21 #include "net/url_request/redirect_info.h" | 22 #include "net/url_request/redirect_info.h" |
22 #include "net/url_request/url_request_context.h" | 23 #include "net/url_request/url_request_context.h" |
23 #include "net/url_request/url_request_job.h" | 24 #include "net/url_request/url_request_job.h" |
24 #include "net/url_request/url_request_test_util.h" | 25 #include "net/url_request/url_request_test_util.h" |
25 #include "storage/browser/blob/blob_storage_context.h" | 26 #include "storage/browser/blob/blob_storage_context.h" |
26 #include "testing/gtest/include/gtest/gtest.h" | 27 #include "testing/gtest/include/gtest/gtest.h" |
27 | 28 |
28 namespace content { | 29 namespace content { |
29 | 30 |
30 namespace { | 31 namespace { |
(...skipping 25 matching lines...) Expand all Loading... |
56 | 57 |
57 ServiceWorkerContextCore* context() const { return helper_->context(); } | 58 ServiceWorkerContextCore* context() const { return helper_->context(); } |
58 ServiceWorkerContextWrapper* context_wrapper() const { | 59 ServiceWorkerContextWrapper* context_wrapper() const { |
59 return helper_->context_wrapper(); | 60 return helper_->context_wrapper(); |
60 } | 61 } |
61 | 62 |
62 std::unique_ptr<net::URLRequest> CreateRequest(const std::string& url, | 63 std::unique_ptr<net::URLRequest> CreateRequest(const std::string& url, |
63 const std::string& method) { | 64 const std::string& method) { |
64 std::unique_ptr<net::URLRequest> request = | 65 std::unique_ptr<net::URLRequest> request = |
65 url_request_context_.CreateRequest(GURL(url), net::DEFAULT_PRIORITY, | 66 url_request_context_.CreateRequest(GURL(url), net::DEFAULT_PRIORITY, |
66 &url_request_delegate_); | 67 &url_request_delegate_, |
| 68 TRAFFIC_ANNOTATION_FOR_TESTS); |
67 request->set_method(method); | 69 request->set_method(method); |
68 return request; | 70 return request; |
69 } | 71 } |
70 | 72 |
71 void InitializeHandler(net::URLRequest* request, | 73 void InitializeHandler(net::URLRequest* request, |
72 bool skip_service_worker, | 74 bool skip_service_worker, |
73 ResourceType resource_type) { | 75 ResourceType resource_type) { |
74 ServiceWorkerRequestHandler::InitializeHandler( | 76 ServiceWorkerRequestHandler::InitializeHandler( |
75 request, context_wrapper(), &blob_storage_context_, | 77 request, context_wrapper(), &blob_storage_context_, |
76 helper_->mock_render_process_id(), kMockProviderId, skip_service_worker, | 78 helper_->mock_render_process_id(), kMockProviderId, skip_service_worker, |
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
158 // Check provider host's URL after initializing a handler for an image. | 160 // Check provider host's URL after initializing a handler for an image. |
159 provider_host_->SetDocumentUrl(GURL("https://host/scope/doc")); | 161 provider_host_->SetDocumentUrl(GURL("https://host/scope/doc")); |
160 std::unique_ptr<net::URLRequest> request = | 162 std::unique_ptr<net::URLRequest> request = |
161 CreateRequest("https://host/scope/image", "GET"); | 163 CreateRequest("https://host/scope/image", "GET"); |
162 InitializeHandler(request.get(), true, RESOURCE_TYPE_IMAGE); | 164 InitializeHandler(request.get(), true, RESOURCE_TYPE_IMAGE); |
163 ASSERT_FALSE(GetHandler(request.get())); | 165 ASSERT_FALSE(GetHandler(request.get())); |
164 EXPECT_EQ(GURL("https://host/scope/doc"), provider_host_->document_url()); | 166 EXPECT_EQ(GURL("https://host/scope/doc"), provider_host_->document_url()); |
165 } | 167 } |
166 | 168 |
167 } // namespace content | 169 } // namespace content |
OLD | NEW |