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

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

Issue 3846005: Revert 62918 - net: clean up SSLHostInfo construction.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 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 | Annotate | Revision Log
« no previous file with comments | « net/http/http_network_transaction.h ('k') | net/http/http_network_transaction_unittest.cc » ('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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_network_transaction.h" 5 #include "net/http/http_network_transaction.h"
6 6
7 #include <set> 7 #include <set>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 } 409 }
410 } 410 }
411 411
412 uint64 HttpNetworkTransaction::GetUploadProgress() const { 412 uint64 HttpNetworkTransaction::GetUploadProgress() const {
413 if (!stream_.get()) 413 if (!stream_.get())
414 return 0; 414 return 0;
415 415
416 return stream_->GetUploadProgress(); 416 return stream_->GetUploadProgress();
417 } 417 }
418 418
419 void HttpNetworkTransaction::SetSSLHostInfo(SSLHostInfo* host_info) {
420 ssl_config_.ssl_host_info = host_info;
421 }
422
419 void HttpNetworkTransaction::OnStreamReady(HttpStream* stream) { 423 void HttpNetworkTransaction::OnStreamReady(HttpStream* stream) {
420 DCHECK_EQ(STATE_CREATE_STREAM_COMPLETE, next_state_); 424 DCHECK_EQ(STATE_CREATE_STREAM_COMPLETE, next_state_);
421 DCHECK(stream_request_.get()); 425 DCHECK(stream_request_.get());
422 426
423 stream_.reset(stream); 427 stream_.reset(stream);
424 response_.was_alternate_protocol_available = 428 response_.was_alternate_protocol_available =
425 stream_request_->was_alternate_protocol_available(); 429 stream_request_->was_alternate_protocol_available();
426 response_.was_npn_negotiated = stream_request_->was_npn_negotiated(); 430 response_.was_npn_negotiated = stream_request_->was_npn_negotiated();
427 response_.was_fetched_via_spdy = stream_request_->using_spdy(); 431 response_.was_fetched_via_spdy = stream_request_->using_spdy();
428 response_.was_fetched_via_proxy = !proxy_info_.is_direct(); 432 response_.was_fetched_via_proxy = !proxy_info_.is_direct();
(...skipping 830 matching lines...) Expand 10 before | Expand all | Expand 10 after
1259 default: 1263 default:
1260 return priority; 1264 return priority;
1261 } 1265 }
1262 } 1266 }
1263 1267
1264 1268
1265 1269
1266 #undef STATE_CASE 1270 #undef STATE_CASE
1267 1271
1268 } // namespace net 1272 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_network_transaction.h ('k') | net/http/http_network_transaction_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698