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 <utility> | 5 #include <utility> |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/macros.h" | 8 #include "base/macros.h" |
9 #include "base/memory/ref_counted.h" | 9 #include "base/memory/ref_counted.h" |
10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
(...skipping 18 matching lines...) Expand all Loading... |
29 #include "net/base/load_flags.h" | 29 #include "net/base/load_flags.h" |
30 #include "net/base/net_errors.h" | 30 #include "net/base/net_errors.h" |
31 #include "net/http/http_response_headers.h" | 31 #include "net/http/http_response_headers.h" |
32 #include "net/url_request/redirect_info.h" | 32 #include "net/url_request/redirect_info.h" |
33 #include "net/url_request/url_request.h" | 33 #include "net/url_request/url_request.h" |
34 #include "net/url_request/url_request_context.h" | 34 #include "net/url_request/url_request_context.h" |
35 #include "net/url_request/url_request_job_factory_impl.h" | 35 #include "net/url_request/url_request_job_factory_impl.h" |
36 #include "net/url_request/url_request_test_job.h" | 36 #include "net/url_request/url_request_test_job.h" |
37 #include "net/url_request/url_request_test_util.h" | 37 #include "net/url_request/url_request_test_util.h" |
38 #include "testing/gtest/include/gtest/gtest.h" | 38 #include "testing/gtest/include/gtest/gtest.h" |
| 39 #include "url/origin.h" |
39 | 40 |
40 namespace content { | 41 namespace content { |
41 | 42 |
42 namespace { | 43 namespace { |
43 | 44 |
44 class StreamProtocolHandler | 45 class StreamProtocolHandler |
45 : public net::URLRequestJobFactory::ProtocolHandler { | 46 : public net::URLRequestJobFactory::ProtocolHandler { |
46 public: | 47 public: |
47 StreamProtocolHandler(StreamRegistry* registry) : registry_(registry) {} | 48 StreamProtocolHandler(StreamRegistry* registry) : registry_(registry) {} |
48 | 49 |
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
178 } | 179 } |
179 | 180 |
180 scoped_ptr<NavigationURLLoader> MakeTestLoader( | 181 scoped_ptr<NavigationURLLoader> MakeTestLoader( |
181 const GURL& url, | 182 const GURL& url, |
182 NavigationURLLoaderDelegate* delegate) { | 183 NavigationURLLoaderDelegate* delegate) { |
183 BeginNavigationParams begin_params("GET", std::string(), net::LOAD_NORMAL, | 184 BeginNavigationParams begin_params("GET", std::string(), net::LOAD_NORMAL, |
184 false, false, | 185 false, false, |
185 REQUEST_CONTEXT_TYPE_LOCATION); | 186 REQUEST_CONTEXT_TYPE_LOCATION); |
186 CommonNavigationParams common_params; | 187 CommonNavigationParams common_params; |
187 common_params.url = url; | 188 common_params.url = url; |
188 scoped_ptr<NavigationRequestInfo> request_info( | 189 scoped_ptr<NavigationRequestInfo> request_info(new NavigationRequestInfo( |
189 new NavigationRequestInfo(common_params, begin_params, url, true, false, | 190 common_params, begin_params, url, url::Origin(url), true, false, -1, |
190 -1, scoped_refptr<ResourceRequestBody>())); | 191 scoped_refptr<ResourceRequestBody>())); |
191 | 192 |
192 return NavigationURLLoader::Create( | 193 return NavigationURLLoader::Create( |
193 browser_context_.get(), std::move(request_info), nullptr, delegate); | 194 browser_context_.get(), std::move(request_info), nullptr, delegate); |
194 } | 195 } |
195 | 196 |
196 // Helper function for fetching the body of a URL to a string. | 197 // Helper function for fetching the body of a URL to a string. |
197 std::string FetchURL(const GURL& url) { | 198 std::string FetchURL(const GURL& url) { |
198 net::TestDelegate delegate; | 199 net::TestDelegate delegate; |
199 net::URLRequestContext* request_context = | 200 net::URLRequestContext* request_context = |
200 browser_context_->GetResourceContext()->GetRequestContext(); | 201 browser_context_->GetResourceContext()->GetRequestContext(); |
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
397 | 398 |
398 // Release the body. | 399 // Release the body. |
399 delegate.ReleaseBody(); | 400 delegate.ReleaseBody(); |
400 base::RunLoop().RunUntilIdle(); | 401 base::RunLoop().RunUntilIdle(); |
401 | 402 |
402 // Verify that URLRequestTestJob no longer has anything paused. | 403 // Verify that URLRequestTestJob no longer has anything paused. |
403 EXPECT_FALSE(net::URLRequestTestJob::ProcessOnePendingMessage()); | 404 EXPECT_FALSE(net::URLRequestTestJob::ProcessOnePendingMessage()); |
404 } | 405 } |
405 | 406 |
406 } // namespace content | 407 } // namespace content |
OLD | NEW |