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

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

Issue 2348453002: Remove NPN from SSLConfig and SSLClientSocket*. (Closed)
Patch Set: Re: #7. 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
« no previous file with comments | « no previous file | net/http/http_network_session.h » ('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 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/http/bidirectional_stream.h" 5 #include "net/http/bidirectional_stream.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <string> 8 #include <string>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 if (net_log_.IsCapturing()) { 95 if (net_log_.IsCapturing()) {
96 net_log_.BeginEvent( 96 net_log_.BeginEvent(
97 NetLogEventType::BIDIRECTIONAL_STREAM_ALIVE, 97 NetLogEventType::BIDIRECTIONAL_STREAM_ALIVE,
98 base::Bind(&NetLogCallback, &request_info_->url, &request_info_->method, 98 base::Bind(&NetLogCallback, &request_info_->url, &request_info_->method,
99 base::Unretained(&request_info_->extra_headers))); 99 base::Unretained(&request_info_->extra_headers)));
100 } 100 }
101 101
102 SSLConfig server_ssl_config; 102 SSLConfig server_ssl_config;
103 session->ssl_config_service()->GetSSLConfig(&server_ssl_config); 103 session->ssl_config_service()->GetSSLConfig(&server_ssl_config);
104 session->GetAlpnProtos(&server_ssl_config.alpn_protos); 104 session->GetAlpnProtos(&server_ssl_config.alpn_protos);
105 session->GetNpnProtos(&server_ssl_config.npn_protos);
106 105
107 if (!request_info_->url.SchemeIs(url::kHttpsScheme)) { 106 if (!request_info_->url.SchemeIs(url::kHttpsScheme)) {
108 base::ThreadTaskRunnerHandle::Get()->PostTask( 107 base::ThreadTaskRunnerHandle::Get()->PostTask(
109 FROM_HERE, 108 FROM_HERE,
110 base::Bind(&BidirectionalStream::NotifyFailed, 109 base::Bind(&BidirectionalStream::NotifyFailed,
111 weak_factory_.GetWeakPtr(), ERR_DISALLOWED_URL_SCHEME)); 110 weak_factory_.GetWeakPtr(), ERR_DISALLOWED_URL_SCHEME));
112 return; 111 return;
113 } 112 }
114 113
115 HttpRequestInfo http_request_info; 114 HttpRequestInfo http_request_info;
(...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
416 UMA_HISTOGRAM_TIMES("Net.BidirectionalStream.TimeToSendEnd.QUIC", 415 UMA_HISTOGRAM_TIMES("Net.BidirectionalStream.TimeToSendEnd.QUIC",
417 send_end_time_ - start_time_); 416 send_end_time_ - start_time_);
418 UMA_HISTOGRAM_COUNTS("Net.BidirectionalStream.ReceivedBytes.QUIC", 417 UMA_HISTOGRAM_COUNTS("Net.BidirectionalStream.ReceivedBytes.QUIC",
419 stream_impl_->GetTotalReceivedBytes()); 418 stream_impl_->GetTotalReceivedBytes());
420 UMA_HISTOGRAM_COUNTS("Net.BidirectionalStream.SentBytes.QUIC", 419 UMA_HISTOGRAM_COUNTS("Net.BidirectionalStream.SentBytes.QUIC",
421 stream_impl_->GetTotalSentBytes()); 420 stream_impl_->GetTotalSentBytes());
422 } 421 }
423 } 422 }
424 423
425 } // namespace net 424 } // namespace net
OLDNEW
« no previous file with comments | « no previous file | net/http/http_network_session.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698