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

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

Issue 1101173004: Switch remaining functions from SchemeIsSecure() to SchemeIsCryptographic(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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/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/bind.h" 10 #include "base/bind.h"
(...skipping 564 matching lines...) Expand 10 before | Expand all | Expand 10 after
575 server_ssl_config_ = used_ssl_config; 575 server_ssl_config_ = used_ssl_config;
576 proxy_info_ = used_proxy_info; 576 proxy_info_ = used_proxy_info;
577 if (stream_) 577 if (stream_)
578 total_received_bytes_ += stream_->GetTotalReceivedBytes(); 578 total_received_bytes_ += stream_->GetTotalReceivedBytes();
579 stream_.reset(stream); 579 stream_.reset(stream);
580 stream_request_.reset(); // we're done with the stream request 580 stream_request_.reset(); // we're done with the stream request
581 OnIOComplete(ERR_HTTPS_PROXY_TUNNEL_RESPONSE); 581 OnIOComplete(ERR_HTTPS_PROXY_TUNNEL_RESPONSE);
582 } 582 }
583 583
584 bool HttpNetworkTransaction::IsSecureRequest() const { 584 bool HttpNetworkTransaction::IsSecureRequest() const {
585 return request_->url.SchemeIsSecure(); 585 return request_->url.SchemeIsCryptographic();
586 } 586 }
587 587
588 bool HttpNetworkTransaction::UsingHttpProxyWithoutTunnel() const { 588 bool HttpNetworkTransaction::UsingHttpProxyWithoutTunnel() const {
589 return (proxy_info_.is_http() || proxy_info_.is_https() || 589 return (proxy_info_.is_http() || proxy_info_.is_https() ||
590 proxy_info_.is_quic()) && 590 proxy_info_.is_quic()) &&
591 !(request_->url.SchemeIs("https") || request_->url.SchemeIsWSOrWSS()); 591 !(request_->url.SchemeIs("https") || request_->url.SchemeIsWSOrWSS());
592 } 592 }
593 593
594 void HttpNetworkTransaction::DoCallback(int rv) { 594 void HttpNetworkTransaction::DoCallback(int rv) {
595 DCHECK_NE(rv, ERR_IO_PENDING); 595 DCHECK_NE(rv, ERR_IO_PENDING);
(...skipping 1056 matching lines...) Expand 10 before | Expand all | Expand 10 after
1652 description = base::StringPrintf("Unknown state 0x%08X (%u)", state, 1652 description = base::StringPrintf("Unknown state 0x%08X (%u)", state,
1653 state); 1653 state);
1654 break; 1654 break;
1655 } 1655 }
1656 return description; 1656 return description;
1657 } 1657 }
1658 1658
1659 #undef STATE_CASE 1659 #undef STATE_CASE
1660 1660
1661 } // namespace net 1661 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698