OLD | NEW |
1 // Copyright (c) 2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2008 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 "net/proxy/proxy_script_fetcher.h" | 5 #include "net/proxy/proxy_script_fetcher.h" |
6 | 6 |
7 #include "base/file_path.h" | 7 #include "base/file_path.h" |
8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
10 #include "net/base/net_util.h" | 10 #include "net/base/net_util.h" |
(...skipping 12 matching lines...) Expand all Loading... |
23 struct FetchResult { | 23 struct FetchResult { |
24 int code; | 24 int code; |
25 std::string bytes; | 25 std::string bytes; |
26 }; | 26 }; |
27 | 27 |
28 // A non-mock URL request which can access http:// and file:// urls. | 28 // A non-mock URL request which can access http:// and file:// urls. |
29 class RequestContext : public URLRequestContext { | 29 class RequestContext : public URLRequestContext { |
30 public: | 30 public: |
31 RequestContext() { | 31 RequestContext() { |
32 net::ProxyConfig no_proxy; | 32 net::ProxyConfig no_proxy; |
33 host_resolver_ = new net::HostResolver; | 33 host_resolver_ = net::CreateSystemHostResolver(); |
34 proxy_service_ = net::ProxyService::CreateFixed(no_proxy); | 34 proxy_service_ = net::ProxyService::CreateFixed(no_proxy); |
35 | 35 |
36 http_transaction_factory_ = | 36 http_transaction_factory_ = |
37 new net::HttpCache(net::HttpNetworkLayer::CreateFactory( | 37 new net::HttpCache(net::HttpNetworkLayer::CreateFactory( |
38 host_resolver_, proxy_service_), | 38 host_resolver_, proxy_service_), |
39 disk_cache::CreateInMemoryCacheBackend(0)); | 39 disk_cache::CreateInMemoryCacheBackend(0)); |
40 } | 40 } |
41 ~RequestContext() { | 41 ~RequestContext() { |
42 delete http_transaction_factory_; | 42 delete http_transaction_factory_; |
43 delete proxy_service_; | 43 delete proxy_service_; |
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
328 | 328 |
329 { // Make sure we can still fetch regular URLs. | 329 { // Make sure we can still fetch regular URLs. |
330 GURL url = server->TestServerPage("files/pac.nsproxy"); | 330 GURL url = server->TestServerPage("files/pac.nsproxy"); |
331 FetchResult result = pac_fetcher.Fetch(url); | 331 FetchResult result = pac_fetcher.Fetch(url); |
332 EXPECT_EQ(net::OK, result.code); | 332 EXPECT_EQ(net::OK, result.code); |
333 EXPECT_EQ("-pac.nsproxy-\n", result.bytes); | 333 EXPECT_EQ("-pac.nsproxy-\n", result.bytes); |
334 } | 334 } |
335 } | 335 } |
336 | 336 |
337 } // namespace net | 337 } // namespace net |
OLD | NEW |