OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/websockets/websocket_stream_create_test_base.h" | 5 #include "net/websockets/websocket_stream_create_test_base.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/callback.h" | 9 #include "base/callback.h" |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
94 : has_failed_(false), ssl_fatal_(false) { | 94 : has_failed_(false), ssl_fatal_(false) { |
95 } | 95 } |
96 | 96 |
97 WebSocketStreamCreateTestBase::~WebSocketStreamCreateTestBase() { | 97 WebSocketStreamCreateTestBase::~WebSocketStreamCreateTestBase() { |
98 } | 98 } |
99 | 99 |
100 void WebSocketStreamCreateTestBase::CreateAndConnectStream( | 100 void WebSocketStreamCreateTestBase::CreateAndConnectStream( |
101 const std::string& socket_url, | 101 const std::string& socket_url, |
102 const std::vector<std::string>& sub_protocols, | 102 const std::vector<std::string>& sub_protocols, |
103 const url::Origin& origin, | 103 const url::Origin& origin, |
| 104 const std::string& additional_headers, |
104 std::unique_ptr<base::Timer> timer) { | 105 std::unique_ptr<base::Timer> timer) { |
105 for (size_t i = 0; i < ssl_data_.size(); ++i) { | 106 for (size_t i = 0; i < ssl_data_.size(); ++i) { |
106 url_request_context_host_.AddSSLSocketDataProvider(std::move(ssl_data_[i])); | 107 url_request_context_host_.AddSSLSocketDataProvider(std::move(ssl_data_[i])); |
107 } | 108 } |
108 ssl_data_.clear(); | 109 ssl_data_.clear(); |
109 std::unique_ptr<WebSocketStream::ConnectDelegate> connect_delegate( | 110 std::unique_ptr<WebSocketStream::ConnectDelegate> connect_delegate( |
110 new TestConnectDelegate(this, connect_run_loop_.QuitClosure())); | 111 new TestConnectDelegate(this, connect_run_loop_.QuitClosure())); |
111 WebSocketStream::ConnectDelegate* delegate = connect_delegate.get(); | 112 WebSocketStream::ConnectDelegate* delegate = connect_delegate.get(); |
112 std::unique_ptr<WebSocketHandshakeStreamCreateHelper> create_helper( | 113 std::unique_ptr<WebSocketHandshakeStreamCreateHelper> create_helper( |
113 new DeterministicKeyWebSocketHandshakeStreamCreateHelper(delegate, | 114 new DeterministicKeyWebSocketHandshakeStreamCreateHelper(delegate, |
114 sub_protocols)); | 115 sub_protocols)); |
115 stream_request_ = CreateAndConnectStreamForTesting( | 116 stream_request_ = CreateAndConnectStreamForTesting( |
116 GURL(socket_url), std::move(create_helper), origin, | 117 GURL(socket_url), std::move(create_helper), origin, additional_headers, |
117 url_request_context_host_.GetURLRequestContext(), BoundNetLog(), | 118 url_request_context_host_.GetURLRequestContext(), BoundNetLog(), |
118 std::move(connect_delegate), | 119 std::move(connect_delegate), |
119 timer ? std::move(timer) | 120 timer ? std::move(timer) |
120 : std::unique_ptr<base::Timer>(new base::Timer(false, false))); | 121 : std::unique_ptr<base::Timer>(new base::Timer(false, false))); |
121 } | 122 } |
122 | 123 |
123 std::vector<HeaderKeyValuePair> | 124 std::vector<HeaderKeyValuePair> |
124 WebSocketStreamCreateTestBase::RequestHeadersToVector( | 125 WebSocketStreamCreateTestBase::RequestHeadersToVector( |
125 const HttpRequestHeaders& headers) { | 126 const HttpRequestHeaders& headers) { |
126 HttpRequestHeaders::Iterator it(headers); | 127 HttpRequestHeaders::Iterator it(headers); |
(...skipping 16 matching lines...) Expand all Loading... |
143 | 144 |
144 void WebSocketStreamCreateTestBase::WaitUntilConnectDone() { | 145 void WebSocketStreamCreateTestBase::WaitUntilConnectDone() { |
145 connect_run_loop_.Run(); | 146 connect_run_loop_.Run(); |
146 } | 147 } |
147 | 148 |
148 std::vector<std::string> WebSocketStreamCreateTestBase::NoSubProtocols() { | 149 std::vector<std::string> WebSocketStreamCreateTestBase::NoSubProtocols() { |
149 return std::vector<std::string>(); | 150 return std::vector<std::string>(); |
150 } | 151 } |
151 | 152 |
152 } // namespace net | 153 } // namespace net |
OLD | NEW |