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

Side by Side Diff: net/socket/ssl_client_socket_pool_unittest.cc

Issue 9582034: Fork SPDY/2 and SPDY/3 versions of our SPDY tests, in preparation for landing (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Fix merge bug Created 8 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
« no previous file with comments | « net/net.gyp ('k') | net/socket_stream/socket_stream_job.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_proxy_client_socket_pool.h" 5 #include "net/http/http_proxy_client_socket_pool.h"
6 6
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/time.h" 10 #include "base/time.h"
(...skipping 10 matching lines...) Expand all
21 #include "net/http/http_network_session.h" 21 #include "net/http/http_network_session.h"
22 #include "net/http/http_request_headers.h" 22 #include "net/http/http_request_headers.h"
23 #include "net/http/http_response_headers.h" 23 #include "net/http/http_response_headers.h"
24 #include "net/http/http_server_properties_impl.h" 24 #include "net/http/http_server_properties_impl.h"
25 #include "net/proxy/proxy_service.h" 25 #include "net/proxy/proxy_service.h"
26 #include "net/socket/client_socket_handle.h" 26 #include "net/socket/client_socket_handle.h"
27 #include "net/socket/client_socket_pool_histograms.h" 27 #include "net/socket/client_socket_pool_histograms.h"
28 #include "net/socket/socket_test_util.h" 28 #include "net/socket/socket_test_util.h"
29 #include "net/spdy/spdy_session.h" 29 #include "net/spdy/spdy_session.h"
30 #include "net/spdy/spdy_session_pool.h" 30 #include "net/spdy/spdy_session_pool.h"
31 #include "net/spdy/spdy_test_util.h" 31 #include "net/spdy/spdy_test_util_spdy2.h"
32 #include "testing/gtest/include/gtest/gtest.h" 32 #include "testing/gtest/include/gtest/gtest.h"
33 33
34 using namespace net::test_spdy2;
35
34 namespace net { 36 namespace net {
35 37
36 namespace { 38 namespace {
37 39
38 const int kMaxSockets = 32; 40 const int kMaxSockets = 32;
39 const int kMaxSocketsPerGroup = 6; 41 const int kMaxSocketsPerGroup = 6;
40 42
41 class SSLClientSocketPoolTest : public testing::Test { 43 class SSLClientSocketPoolTest : public testing::Test {
42 protected: 44 protected:
43 SSLClientSocketPoolTest() 45 SSLClientSocketPoolTest()
(...skipping 775 matching lines...) Expand 10 before | Expand all | Expand 10 after
819 EXPECT_FALSE(session_->spdy_session_pool()->HasSession(test_hosts[1].pair)); 821 EXPECT_FALSE(session_->spdy_session_pool()->HasSession(test_hosts[1].pair));
820 822
821 session_->spdy_session_pool()->CloseAllSessions(); 823 session_->spdy_session_pool()->CloseAllSessions();
822 } 824 }
823 825
824 // It would be nice to also test the timeouts in SSLClientSocketPool. 826 // It would be nice to also test the timeouts in SSLClientSocketPool.
825 827
826 } // namespace 828 } // namespace
827 829
828 } // namespace net 830 } // namespace net
OLDNEW
« no previous file with comments | « net/net.gyp ('k') | net/socket_stream/socket_stream_job.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698