Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(293)

Side by Side Diff: net/http/http_network_transaction_spdy2_unittest.cc

Issue 12680003: net: split net/ssl out of net/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/http/http_network_transaction.h" 5 #include "net/http/http_network_transaction.h"
6 6
7 #include <math.h> // ceil 7 #include <math.h> // ceil
8 #include <stdarg.h> 8 #include <stdarg.h>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 13 matching lines...) Expand all
24 #include "net/base/cert_test_util.h" 24 #include "net/base/cert_test_util.h"
25 #include "net/base/completion_callback.h" 25 #include "net/base/completion_callback.h"
26 #include "net/base/host_cache.h" 26 #include "net/base/host_cache.h"
27 #include "net/base/load_timing_info.h" 27 #include "net/base/load_timing_info.h"
28 #include "net/base/load_timing_info_test_util.h" 28 #include "net/base/load_timing_info_test_util.h"
29 #include "net/base/mock_cert_verifier.h" 29 #include "net/base/mock_cert_verifier.h"
30 #include "net/base/mock_host_resolver.h" 30 #include "net/base/mock_host_resolver.h"
31 #include "net/base/net_log.h" 31 #include "net/base/net_log.h"
32 #include "net/base/net_log_unittest.h" 32 #include "net/base/net_log_unittest.h"
33 #include "net/base/request_priority.h" 33 #include "net/base/request_priority.h"
34 #include "net/base/ssl_cert_request_info.h"
35 #include "net/base/ssl_config_service_defaults.h"
36 #include "net/base/ssl_info.h"
37 #include "net/base/test_completion_callback.h" 34 #include "net/base/test_completion_callback.h"
38 #include "net/base/test_data_directory.h" 35 #include "net/base/test_data_directory.h"
39 #include "net/base/upload_bytes_element_reader.h" 36 #include "net/base/upload_bytes_element_reader.h"
40 #include "net/base/upload_data_stream.h" 37 #include "net/base/upload_data_stream.h"
41 #include "net/base/upload_file_element_reader.h" 38 #include "net/base/upload_file_element_reader.h"
42 #include "net/http/http_auth_handler_digest.h" 39 #include "net/http/http_auth_handler_digest.h"
43 #include "net/http/http_auth_handler_mock.h" 40 #include "net/http/http_auth_handler_mock.h"
44 #include "net/http/http_auth_handler_ntlm.h" 41 #include "net/http/http_auth_handler_ntlm.h"
45 #include "net/http/http_basic_stream.h" 42 #include "net/http/http_basic_stream.h"
46 #include "net/http/http_network_session.h" 43 #include "net/http/http_network_session.h"
47 #include "net/http/http_network_session_peer.h" 44 #include "net/http/http_network_session_peer.h"
48 #include "net/http/http_server_properties_impl.h" 45 #include "net/http/http_server_properties_impl.h"
49 #include "net/http/http_stream.h" 46 #include "net/http/http_stream.h"
50 #include "net/http/http_stream_factory.h" 47 #include "net/http/http_stream_factory.h"
51 #include "net/http/http_transaction_unittest.h" 48 #include "net/http/http_transaction_unittest.h"
52 #include "net/proxy/proxy_config_service_fixed.h" 49 #include "net/proxy/proxy_config_service_fixed.h"
53 #include "net/proxy/proxy_resolver.h" 50 #include "net/proxy/proxy_resolver.h"
54 #include "net/proxy/proxy_service.h" 51 #include "net/proxy/proxy_service.h"
55 #include "net/socket/client_socket_factory.h" 52 #include "net/socket/client_socket_factory.h"
56 #include "net/socket/mock_client_socket_pool_manager.h" 53 #include "net/socket/mock_client_socket_pool_manager.h"
57 #include "net/socket/socket_test_util.h" 54 #include "net/socket/socket_test_util.h"
58 #include "net/socket/ssl_client_socket.h" 55 #include "net/socket/ssl_client_socket.h"
59 #include "net/spdy/spdy_framer.h" 56 #include "net/spdy/spdy_framer.h"
60 #include "net/spdy/spdy_session.h" 57 #include "net/spdy/spdy_session.h"
61 #include "net/spdy/spdy_session_pool.h" 58 #include "net/spdy/spdy_session_pool.h"
62 #include "net/spdy/spdy_test_util_spdy2.h" 59 #include "net/spdy/spdy_test_util_spdy2.h"
60 #include "net/ssl/ssl_cert_request_info.h"
61 #include "net/ssl/ssl_config_service_defaults.h"
62 #include "net/ssl/ssl_info.h"
63 #include "testing/gtest/include/gtest/gtest.h" 63 #include "testing/gtest/include/gtest/gtest.h"
64 #include "testing/platform_test.h" 64 #include "testing/platform_test.h"
65 65
66 using namespace net::test_spdy2; 66 using namespace net::test_spdy2;
67 67
68 //----------------------------------------------------------------------------- 68 //-----------------------------------------------------------------------------
69 69
70 namespace { 70 namespace {
71 71
72 const string16 kBar(ASCIIToUTF16("bar")); 72 const string16 kBar(ASCIIToUTF16("bar"));
(...skipping 11079 matching lines...) Expand 10 before | Expand all | Expand 10 after
11152 trans2.Start(&request2, callback2.callback(), BoundNetLog())); 11152 trans2.Start(&request2, callback2.callback(), BoundNetLog()));
11153 MessageLoop::current()->RunUntilIdle(); 11153 MessageLoop::current()->RunUntilIdle();
11154 data2->RunFor(3); 11154 data2->RunFor(3);
11155 11155
11156 ASSERT_TRUE(callback2.have_result()); 11156 ASSERT_TRUE(callback2.have_result());
11157 EXPECT_EQ(OK, callback2.WaitForResult()); 11157 EXPECT_EQ(OK, callback2.WaitForResult());
11158 EXPECT_TRUE(trans2.GetResponseInfo()->was_fetched_via_spdy); 11158 EXPECT_TRUE(trans2.GetResponseInfo()->was_fetched_via_spdy);
11159 } 11159 }
11160 11160
11161 } // namespace net 11161 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_network_transaction.cc ('k') | net/http/http_network_transaction_spdy3_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698