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

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

Issue 2229393003: net: Use stl utilities from the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 4 years, 4 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_stream_factory_impl_job.h" 5 #include "net/http/http_stream_factory_impl_job.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 729 matching lines...) Expand 10 before | Expand all | Expand 10 after
740 if (result != OK) { 740 if (result != OK) {
741 return result; 741 return result;
742 } 742 }
743 743
744 next_state_ = STATE_WAIT; 744 next_state_ = STATE_WAIT;
745 return OK; 745 return OK;
746 } 746 }
747 747
748 bool HttpStreamFactoryImpl::Job::ShouldForceQuic() const { 748 bool HttpStreamFactoryImpl::Job::ShouldForceQuic() const {
749 return session_->params().enable_quic && 749 return session_->params().enable_quic &&
750 (ContainsKey(session_->params().origins_to_force_quic_on, 750 (base::ContainsKey(session_->params().origins_to_force_quic_on,
751 HostPortPair()) || 751 HostPortPair()) ||
752 ContainsKey(session_->params().origins_to_force_quic_on, 752 base::ContainsKey(session_->params().origins_to_force_quic_on,
753 destination_)) && 753 destination_)) &&
754 proxy_info_.is_direct() && origin_url_.SchemeIs("https"); 754 proxy_info_.is_direct() && origin_url_.SchemeIs("https");
755 } 755 }
756 756
757 int HttpStreamFactoryImpl::Job::DoWait() { 757 int HttpStreamFactoryImpl::Job::DoWait() {
758 next_state_ = STATE_WAIT_COMPLETE; 758 next_state_ = STATE_WAIT_COMPLETE;
759 if (delegate_->ShouldWait(this)) 759 if (delegate_->ShouldWait(this))
760 return ERR_IO_PENDING; 760 return ERR_IO_PENDING;
761 761
762 return OK; 762 return OK;
763 } 763 }
(...skipping 767 matching lines...) Expand 10 before | Expand all | Expand 10 after
1531 1531
1532 ConnectionAttempts socket_attempts = connection_->connection_attempts(); 1532 ConnectionAttempts socket_attempts = connection_->connection_attempts();
1533 if (connection_->socket()) { 1533 if (connection_->socket()) {
1534 connection_->socket()->GetConnectionAttempts(&socket_attempts); 1534 connection_->socket()->GetConnectionAttempts(&socket_attempts);
1535 } 1535 }
1536 1536
1537 delegate_->AddConnectionAttemptsToRequest(this, socket_attempts); 1537 delegate_->AddConnectionAttemptsToRequest(this, socket_attempts);
1538 } 1538 }
1539 1539
1540 } // namespace net 1540 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_stream_factory_impl.cc ('k') | net/http/http_stream_factory_impl_job_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698