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

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

Issue 2351513002: net: rename BoundNetLog to NetLogWithSource (Closed)
Patch Set: one more fix, content bound_net_log_ Created 4 years, 3 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 <memory> 5 #include <memory>
6 #include <string> 6 #include <string>
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/memory/ptr_util.h" 9 #include "base/memory/ptr_util.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 MockRead(SYNCHRONOUS, OK)}; 142 MockRead(SYNCHRONOUS, OK)};
143 StaticSocketDataProvider data(mock_reads, arraysize(mock_reads), NULL, 0); 143 StaticSocketDataProvider data(mock_reads, arraysize(mock_reads), NULL, 0);
144 mock_socket_factory_.AddSocketDataProvider(&data); 144 mock_socket_factory_.AddSocketDataProvider(&data);
145 145
146 HttpNetworkSession session(session_params_); 146 HttpNetworkSession session(session_params_);
147 HttpNetworkTransaction trans1(DEFAULT_PRIORITY, &session); 147 HttpNetworkTransaction trans1(DEFAULT_PRIORITY, &session);
148 148
149 TestCompletionCallback callback; 149 TestCompletionCallback callback;
150 int rv = callback.GetResult( 150 int rv = callback.GetResult(
151 trans1.Start(GetRequestInfo("https://www.example.com/"), 151 trans1.Start(GetRequestInfo("https://www.example.com/"),
152 callback.callback(), BoundNetLog())); 152 callback.callback(), NetLogWithSource()));
153 EXPECT_THAT(rv, IsOk()); 153 EXPECT_THAT(rv, IsOk());
154 154
155 HttpRequestHeaders headers1; 155 HttpRequestHeaders headers1;
156 ASSERT_TRUE(trans1.GetFullRequestHeaders(&headers1)); 156 ASSERT_TRUE(trans1.GetFullRequestHeaders(&headers1));
157 std::string token_binding_header1; 157 std::string token_binding_header1;
158 EXPECT_TRUE(headers1.GetHeader(HttpRequestHeaders::kTokenBinding, 158 EXPECT_TRUE(headers1.GetHeader(HttpRequestHeaders::kTokenBinding,
159 &token_binding_header1)); 159 &token_binding_header1));
160 160
161 // Send a second request and verify that the token binding header is the same 161 // Send a second request and verify that the token binding header is the same
162 // as in the first request. 162 // as in the first request.
163 mock_socket_factory_.AddSSLSocketDataProvider(&ssl_data); 163 mock_socket_factory_.AddSSLSocketDataProvider(&ssl_data);
164 StaticSocketDataProvider data2(mock_reads, arraysize(mock_reads), NULL, 0); 164 StaticSocketDataProvider data2(mock_reads, arraysize(mock_reads), NULL, 0);
165 mock_socket_factory_.AddSocketDataProvider(&data2); 165 mock_socket_factory_.AddSocketDataProvider(&data2);
166 HttpNetworkTransaction trans2(DEFAULT_PRIORITY, &session); 166 HttpNetworkTransaction trans2(DEFAULT_PRIORITY, &session);
167 167
168 rv = callback.GetResult( 168 rv = callback.GetResult(
169 trans2.Start(GetRequestInfo("https://www.example.com/"), 169 trans2.Start(GetRequestInfo("https://www.example.com/"),
170 callback.callback(), BoundNetLog())); 170 callback.callback(), NetLogWithSource()));
171 EXPECT_THAT(rv, IsOk()); 171 EXPECT_THAT(rv, IsOk());
172 172
173 HttpRequestHeaders headers2; 173 HttpRequestHeaders headers2;
174 ASSERT_TRUE(trans2.GetFullRequestHeaders(&headers2)); 174 ASSERT_TRUE(trans2.GetFullRequestHeaders(&headers2));
175 std::string token_binding_header2; 175 std::string token_binding_header2;
176 EXPECT_TRUE(headers2.GetHeader(HttpRequestHeaders::kTokenBinding, 176 EXPECT_TRUE(headers2.GetHeader(HttpRequestHeaders::kTokenBinding,
177 &token_binding_header2)); 177 &token_binding_header2));
178 178
179 EXPECT_EQ(token_binding_header1, token_binding_header2); 179 EXPECT_EQ(token_binding_header1, token_binding_header2);
180 } 180 }
(...skipping 13 matching lines...) Expand all
194 MockRead(SYNCHRONOUS, OK)}; 194 MockRead(SYNCHRONOUS, OK)};
195 StaticSocketDataProvider data(mock_reads, arraysize(mock_reads), NULL, 0); 195 StaticSocketDataProvider data(mock_reads, arraysize(mock_reads), NULL, 0);
196 mock_socket_factory_.AddSocketDataProvider(&data); 196 mock_socket_factory_.AddSocketDataProvider(&data);
197 197
198 HttpNetworkSession session(session_params_); 198 HttpNetworkSession session(session_params_);
199 HttpNetworkTransaction trans(DEFAULT_PRIORITY, &session); 199 HttpNetworkTransaction trans(DEFAULT_PRIORITY, &session);
200 200
201 TestCompletionCallback callback; 201 TestCompletionCallback callback;
202 int rv = 202 int rv =
203 callback.GetResult(trans.Start(GetRequestInfo("http://www.example.com/"), 203 callback.GetResult(trans.Start(GetRequestInfo("http://www.example.com/"),
204 callback.callback(), BoundNetLog())); 204 callback.callback(), NetLogWithSource()));
205 EXPECT_THAT(rv, IsOk()); 205 EXPECT_THAT(rv, IsOk());
206 206
207 HttpRequestHeaders headers; 207 HttpRequestHeaders headers;
208 ASSERT_TRUE(trans.GetFullRequestHeaders(&headers)); 208 ASSERT_TRUE(trans.GetFullRequestHeaders(&headers));
209 std::string token_binding_header; 209 std::string token_binding_header;
210 EXPECT_FALSE(headers.GetHeader(HttpRequestHeaders::kTokenBinding, 210 EXPECT_FALSE(headers.GetHeader(HttpRequestHeaders::kTokenBinding,
211 &token_binding_header)); 211 &token_binding_header));
212 } 212 }
213 #endif // !defined(OS_IOS) 213 #endif // !defined(OS_IOS)
214 214
215 } // namespace net 215 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698