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

Side by Side Diff: net/spdy/spdy_proxy_client_socket_unittest.cc

Issue 2351513002: net: rename BoundNetLog to NetLogWithSource (Closed)
Patch Set: one more fix, content bound_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/spdy/spdy_proxy_client_socket.h" 5 #include "net/spdy/spdy_proxy_client_socket.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 new SequencedSocketData(reads, reads_count, writes, writes_count)); 182 new SequencedSocketData(reads, reads_count, writes, writes_count));
183 data_->set_connect_data(connect_data_); 183 data_->set_connect_data(connect_data_);
184 184
185 session_deps_.socket_factory->AddSocketDataProvider(data_.get()); 185 session_deps_.socket_factory->AddSocketDataProvider(data_.get());
186 session_deps_.host_resolver->set_synchronous_mode(true); 186 session_deps_.host_resolver->set_synchronous_mode(true);
187 187
188 session_ = SpdySessionDependencies::SpdyCreateSession(&session_deps_); 188 session_ = SpdySessionDependencies::SpdyCreateSession(&session_deps_);
189 189
190 // Creates the SPDY session and stream. 190 // Creates the SPDY session and stream.
191 spdy_session_ = CreateInsecureSpdySession( 191 spdy_session_ = CreateInsecureSpdySession(
192 session_.get(), endpoint_spdy_session_key_, BoundNetLog()); 192 session_.get(), endpoint_spdy_session_key_, NetLogWithSource());
193 base::WeakPtr<SpdyStream> spdy_stream( 193 base::WeakPtr<SpdyStream> spdy_stream(
194 CreateStreamSynchronously( 194 CreateStreamSynchronously(
195 SPDY_BIDIRECTIONAL_STREAM, spdy_session_, url_, LOWEST, 195 SPDY_BIDIRECTIONAL_STREAM, spdy_session_, url_, LOWEST,
196 net_log_.bound())); 196 net_log_.bound()));
197 ASSERT_TRUE(spdy_stream.get() != NULL); 197 ASSERT_TRUE(spdy_stream.get() != NULL);
198 198
199 // Create the SpdyProxyClientSocket. 199 // Create the SpdyProxyClientSocket.
200 sock_.reset(new SpdyProxyClientSocket( 200 sock_.reset(new SpdyProxyClientSocket(
201 spdy_stream, user_agent_, endpoint_host_port_pair_, proxy_host_port_, 201 spdy_stream, user_agent_, endpoint_host_port_pair_, proxy_host_port_,
202 net_log_.bound(), 202 net_log_.bound(),
(...skipping 1144 matching lines...) Expand 10 before | Expand all | Expand 10 after
1347 1347
1348 EXPECT_FALSE(sock_.get()); 1348 EXPECT_FALSE(sock_.get());
1349 EXPECT_TRUE(read_callback.have_result()); 1349 EXPECT_TRUE(read_callback.have_result());
1350 EXPECT_FALSE(write_callback_.have_result()); 1350 EXPECT_FALSE(write_callback_.have_result());
1351 1351
1352 // Let the RST_STREAM write while |rst| is in-scope. 1352 // Let the RST_STREAM write while |rst| is in-scope.
1353 base::RunLoop().RunUntilIdle(); 1353 base::RunLoop().RunUntilIdle();
1354 } 1354 }
1355 1355
1356 } // namespace net 1356 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698