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/base/cert_verifier.h" |
5 #include "net/base/mock_host_resolver.h" | 6 #include "net/base/mock_host_resolver.h" |
6 #include "net/base/net_log.h" | 7 #include "net/base/net_log.h" |
7 #include "net/base/ssl_config_service_defaults.h" | 8 #include "net/base/ssl_config_service_defaults.h" |
8 #include "net/http/http_network_layer.h" | 9 #include "net/http/http_network_layer.h" |
9 #include "net/http/http_transaction_unittest.h" | 10 #include "net/http/http_transaction_unittest.h" |
10 #include "net/proxy/proxy_service.h" | 11 #include "net/proxy/proxy_service.h" |
11 #include "net/socket/socket_test_util.h" | 12 #include "net/socket/socket_test_util.h" |
12 #include "testing/gtest/include/gtest/gtest.h" | 13 #include "testing/gtest/include/gtest/gtest.h" |
13 #include "testing/platform_test.h" | 14 #include "testing/platform_test.h" |
14 | 15 |
15 namespace net { | 16 namespace net { |
16 | 17 |
17 namespace { | 18 namespace { |
18 | 19 |
19 class HttpNetworkLayerTest : public PlatformTest { | 20 class HttpNetworkLayerTest : public PlatformTest { |
20 }; | 21 }; |
21 | 22 |
22 TEST_F(HttpNetworkLayerTest, CreateAndDestroy) { | 23 TEST_F(HttpNetworkLayerTest, CreateAndDestroy) { |
23 MockHostResolver host_resolver; | 24 MockHostResolver host_resolver; |
| 25 net::CertVerifier cert_verifier; |
24 net::HttpNetworkLayer factory( | 26 net::HttpNetworkLayer factory( |
25 NULL, | 27 NULL, |
26 &host_resolver, | 28 &host_resolver, |
| 29 &cert_verifier, |
27 NULL /* dnsrr_resolver */, | 30 NULL /* dnsrr_resolver */, |
28 NULL /* dns_cert_checker */, | 31 NULL /* dns_cert_checker */, |
29 NULL /* ssl_host_info_factory */, | 32 NULL /* ssl_host_info_factory */, |
30 net::ProxyService::CreateDirect(), | 33 net::ProxyService::CreateDirect(), |
31 new net::SSLConfigServiceDefaults, | 34 new net::SSLConfigServiceDefaults, |
32 NULL, | 35 NULL, |
33 NULL, | 36 NULL, |
34 NULL); | 37 NULL); |
35 | 38 |
36 scoped_ptr<net::HttpTransaction> trans; | 39 scoped_ptr<net::HttpTransaction> trans; |
37 int rv = factory.CreateTransaction(&trans); | 40 int rv = factory.CreateTransaction(&trans); |
38 EXPECT_EQ(net::OK, rv); | 41 EXPECT_EQ(net::OK, rv); |
39 EXPECT_TRUE(trans.get() != NULL); | 42 EXPECT_TRUE(trans.get() != NULL); |
40 } | 43 } |
41 | 44 |
42 TEST_F(HttpNetworkLayerTest, Suspend) { | 45 TEST_F(HttpNetworkLayerTest, Suspend) { |
43 MockHostResolver host_resolver; | 46 MockHostResolver host_resolver; |
| 47 net::CertVerifier cert_verifier; |
44 net::HttpNetworkLayer factory( | 48 net::HttpNetworkLayer factory( |
45 NULL, | 49 NULL, |
46 &host_resolver, | 50 &host_resolver, |
| 51 &cert_verifier, |
47 NULL /* dnsrr_resolver */, | 52 NULL /* dnsrr_resolver */, |
48 NULL /* dns_cert_checker */, | 53 NULL /* dns_cert_checker */, |
49 NULL /* ssl_host_info_factory */, | 54 NULL /* ssl_host_info_factory */, |
50 net::ProxyService::CreateDirect(), | 55 net::ProxyService::CreateDirect(), |
51 new net::SSLConfigServiceDefaults, | 56 new net::SSLConfigServiceDefaults, |
52 NULL, | 57 NULL, |
53 NULL, | 58 NULL, |
54 NULL); | 59 NULL); |
55 | 60 |
56 scoped_ptr<net::HttpTransaction> trans; | 61 scoped_ptr<net::HttpTransaction> trans; |
(...skipping 26 matching lines...) Expand all Loading... |
83 net::MockWrite("GET / HTTP/1.1\r\n" | 88 net::MockWrite("GET / HTTP/1.1\r\n" |
84 "Host: www.google.com\r\n" | 89 "Host: www.google.com\r\n" |
85 "Connection: keep-alive\r\n" | 90 "Connection: keep-alive\r\n" |
86 "User-Agent: Foo/1.0\r\n\r\n"), | 91 "User-Agent: Foo/1.0\r\n\r\n"), |
87 }; | 92 }; |
88 net::StaticSocketDataProvider data(data_reads, arraysize(data_reads), | 93 net::StaticSocketDataProvider data(data_reads, arraysize(data_reads), |
89 data_writes, arraysize(data_writes)); | 94 data_writes, arraysize(data_writes)); |
90 mock_socket_factory.AddSocketDataProvider(&data); | 95 mock_socket_factory.AddSocketDataProvider(&data); |
91 | 96 |
92 MockHostResolver host_resolver; | 97 MockHostResolver host_resolver; |
| 98 net::CertVerifier cert_verifier; |
93 net::HttpNetworkLayer factory( | 99 net::HttpNetworkLayer factory( |
94 &mock_socket_factory, | 100 &mock_socket_factory, |
95 &host_resolver, | 101 &host_resolver, |
| 102 &cert_verifier, |
96 NULL /* dnsrr_resolver */, | 103 NULL /* dnsrr_resolver */, |
97 NULL /* dns_cert_checker */, | 104 NULL /* dns_cert_checker */, |
98 NULL /* ssl_host_info_factory */, | 105 NULL /* ssl_host_info_factory */, |
99 net::ProxyService::CreateDirect(), | 106 net::ProxyService::CreateDirect(), |
100 new net::SSLConfigServiceDefaults, | 107 new net::SSLConfigServiceDefaults, |
101 NULL, | 108 NULL, |
102 NULL, | 109 NULL, |
103 NULL); | 110 NULL); |
104 | 111 |
105 TestCompletionCallback callback; | 112 TestCompletionCallback callback; |
(...skipping 16 matching lines...) Expand all Loading... |
122 | 129 |
123 std::string contents; | 130 std::string contents; |
124 rv = ReadTransaction(trans.get(), &contents); | 131 rv = ReadTransaction(trans.get(), &contents); |
125 EXPECT_EQ(net::OK, rv); | 132 EXPECT_EQ(net::OK, rv); |
126 EXPECT_EQ("hello world", contents); | 133 EXPECT_EQ("hello world", contents); |
127 } | 134 } |
128 | 135 |
129 } // namespace | 136 } // namespace |
130 | 137 |
131 } // namespace net | 138 } // namespace net |
OLD | NEW |