OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
(...skipping 17 matching lines...) Expand all Loading... |
28 int code; | 28 int code; |
29 string16 text; | 29 string16 text; |
30 }; | 30 }; |
31 | 31 |
32 // A non-mock URL request which can access http:// and file:// urls. | 32 // A non-mock URL request which can access http:// and file:// urls. |
33 class RequestContext : public URLRequestContext { | 33 class RequestContext : public URLRequestContext { |
34 public: | 34 public: |
35 RequestContext() { | 35 RequestContext() { |
36 net::ProxyConfig no_proxy; | 36 net::ProxyConfig no_proxy; |
37 host_resolver_ = | 37 host_resolver_ = |
38 net::CreateSystemHostResolver(net::HostResolver::kDefaultParallelism); | 38 net::CreateSystemHostResolver(net::HostResolver::kDefaultParallelism, |
| 39 NULL); |
39 proxy_service_ = net::ProxyService::CreateFixed(no_proxy); | 40 proxy_service_ = net::ProxyService::CreateFixed(no_proxy); |
40 ssl_config_service_ = new net::SSLConfigServiceDefaults; | 41 ssl_config_service_ = new net::SSLConfigServiceDefaults; |
41 | 42 |
42 http_transaction_factory_ = new net::HttpCache( | 43 http_transaction_factory_ = new net::HttpCache( |
43 net::HttpNetworkLayer::CreateFactory(host_resolver_, proxy_service_, | 44 net::HttpNetworkLayer::CreateFactory(host_resolver_, proxy_service_, |
44 ssl_config_service_, NULL, NULL, NULL), | 45 ssl_config_service_, NULL, NULL, NULL), |
45 net::HttpCache::DefaultBackend::InMemory(0)); | 46 net::HttpCache::DefaultBackend::InMemory(0)); |
46 } | 47 } |
47 | 48 |
48 private: | 49 private: |
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
322 string16 text; | 323 string16 text; |
323 TestCompletionCallback callback; | 324 TestCompletionCallback callback; |
324 int result = pac_fetcher->Fetch(url, &text, &callback); | 325 int result = pac_fetcher->Fetch(url, &text, &callback); |
325 EXPECT_EQ(ERR_IO_PENDING, result); | 326 EXPECT_EQ(ERR_IO_PENDING, result); |
326 EXPECT_EQ(OK, callback.WaitForResult()); | 327 EXPECT_EQ(OK, callback.WaitForResult()); |
327 EXPECT_EQ(ASCIIToUTF16("This was encoded as UTF-16BE.\n"), text); | 328 EXPECT_EQ(ASCIIToUTF16("This was encoded as UTF-16BE.\n"), text); |
328 } | 329 } |
329 } | 330 } |
330 | 331 |
331 } // namespace net | 332 } // namespace net |
OLD | NEW |