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

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

Issue 2333923004: Extracting NetLog inner classes into their own classes. (Closed)
Patch Set: Some nit fixes and better, impl-agnostic naming of net_log_parameters_callback_typedef.h -> net/log… Created 4 years, 2 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
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_stream_factory_impl.h" 5 #include "net/http/http_stream_factory_impl.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 13 matching lines...) Expand all
24 #include "net/http/bidirectional_stream_request_info.h" 24 #include "net/http/bidirectional_stream_request_info.h"
25 #include "net/http/http_auth_handler_factory.h" 25 #include "net/http/http_auth_handler_factory.h"
26 #include "net/http/http_network_session.h" 26 #include "net/http/http_network_session.h"
27 #include "net/http/http_network_session_peer.h" 27 #include "net/http/http_network_session_peer.h"
28 #include "net/http/http_network_transaction.h" 28 #include "net/http/http_network_transaction.h"
29 #include "net/http/http_request_info.h" 29 #include "net/http/http_request_info.h"
30 #include "net/http/http_server_properties.h" 30 #include "net/http/http_server_properties.h"
31 #include "net/http/http_server_properties_impl.h" 31 #include "net/http/http_server_properties_impl.h"
32 #include "net/http/http_stream.h" 32 #include "net/http/http_stream.h"
33 #include "net/http/transport_security_state.h" 33 #include "net/http/transport_security_state.h"
34 #include "net/log/net_log.h" 34 #include "net/log/net_log_with_source.h"
35 #include "net/proxy/proxy_info.h" 35 #include "net/proxy/proxy_info.h"
36 #include "net/proxy/proxy_service.h" 36 #include "net/proxy/proxy_service.h"
37 #include "net/quic/core/quic_http_utils.h" 37 #include "net/quic/core/quic_http_utils.h"
38 #include "net/quic/core/quic_server_id.h" 38 #include "net/quic/core/quic_server_id.h"
39 #include "net/quic/test_tools/crypto_test_utils.h" 39 #include "net/quic/test_tools/crypto_test_utils.h"
40 #include "net/quic/test_tools/mock_crypto_client_stream_factory.h" 40 #include "net/quic/test_tools/mock_crypto_client_stream_factory.h"
41 #include "net/quic/test_tools/mock_random.h" 41 #include "net/quic/test_tools/mock_random.h"
42 #include "net/quic/test_tools/quic_stream_factory_peer.h" 42 #include "net/quic/test_tools/quic_stream_factory_peer.h"
43 #include "net/quic/test_tools/quic_test_packet_maker.h" 43 #include "net/quic/test_tools/quic_test_packet_maker.h"
44 #include "net/quic/test_tools/quic_test_utils.h" 44 #include "net/quic/test_tools/quic_test_utils.h"
(...skipping 14 matching lines...) Expand all
59 // it is in net/websockets because it doesn't 59 // it is in net/websockets because it doesn't
60 // introduce any link dependency to net/websockets. 60 // introduce any link dependency to net/websockets.
61 #include "net/websockets/websocket_handshake_stream_base.h" 61 #include "net/websockets/websocket_handshake_stream_base.h"
62 62
63 #include "testing/gmock/include/gmock/gmock.h" 63 #include "testing/gmock/include/gmock/gmock.h"
64 #include "testing/gtest/include/gtest/gtest.h" 64 #include "testing/gtest/include/gtest/gtest.h"
65 65
66 using net::test::IsError; 66 using net::test::IsError;
67 using net::test::IsOk; 67 using net::test::IsOk;
68 68
69 namespace base {
70 class Value;
71 class DictionaryValue;
72 } // namespace base
73
69 namespace net { 74 namespace net {
70 75
71 class BidirectionalStreamImpl; 76 class BidirectionalStreamImpl;
72 77
73 namespace { 78 namespace {
74 79
75 class MockWebSocketHandshakeStream : public WebSocketHandshakeStreamBase { 80 class MockWebSocketHandshakeStream : public WebSocketHandshakeStreamBase {
76 public: 81 public:
77 enum StreamType { 82 enum StreamType {
78 kStreamTypeBasic, 83 kStreamTypeBasic,
(...skipping 2179 matching lines...) Expand 10 before | Expand all | Expand 10 after
2258 session->GetTransportSocketPool( 2263 session->GetTransportSocketPool(
2259 HttpNetworkSession::WEBSOCKET_SOCKET_POOL))); 2264 HttpNetworkSession::WEBSOCKET_SOCKET_POOL)));
2260 EXPECT_EQ(1, GetSocketPoolGroupCount( 2265 EXPECT_EQ(1, GetSocketPoolGroupCount(
2261 session->GetSSLSocketPool(HttpNetworkSession::WEBSOCKET_SOCKET_POOL))); 2266 session->GetSSLSocketPool(HttpNetworkSession::WEBSOCKET_SOCKET_POOL)));
2262 EXPECT_TRUE(waiter.used_proxy_info().is_direct()); 2267 EXPECT_TRUE(waiter.used_proxy_info().is_direct());
2263 } 2268 }
2264 2269
2265 } // namespace 2270 } // namespace
2266 2271
2267 } // namespace net 2272 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698