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

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

Issue 2109803002: Change a number of SPDY unittests from http to https. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 5 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 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 establishing_tunnel_(false), 211 establishing_tunnel_(false),
212 was_npn_negotiated_(false), 212 was_npn_negotiated_(false),
213 protocol_negotiated_(kProtoUnknown), 213 protocol_negotiated_(kProtoUnknown),
214 num_streams_(0), 214 num_streams_(0),
215 spdy_session_direct_(false), 215 spdy_session_direct_(false),
216 job_status_(STATUS_RUNNING), 216 job_status_(STATUS_RUNNING),
217 other_job_status_(STATUS_RUNNING), 217 other_job_status_(STATUS_RUNNING),
218 stream_type_(HttpStreamRequest::BIDIRECTIONAL_STREAM), 218 stream_type_(HttpStreamRequest::BIDIRECTIONAL_STREAM),
219 ptr_factory_(this) { 219 ptr_factory_(this) {
220 DCHECK(session); 220 DCHECK(session);
221 if (IsSpdyAlternative() && 221 if (IsSpdyAlternative()) {
222 !session_->params().enable_alternative_service_for_insecure_origins) {
223 DCHECK(origin_url_.SchemeIs("https")); 222 DCHECK(origin_url_.SchemeIs("https"));
224 } 223 }
225 if (IsQuicAlternative()) { 224 if (IsQuicAlternative()) {
226 DCHECK(session_->params().enable_quic); 225 DCHECK(session_->params().enable_quic);
227 using_quic_ = true; 226 using_quic_ = true;
228 } 227 }
229 } 228 }
230 229
231 HttpStreamFactoryImpl::Job::~Job() { 230 HttpStreamFactoryImpl::Job::~Job() {
232 net_log_.EndEvent(NetLog::TYPE_HTTP_STREAM_JOB); 231 net_log_.EndEvent(NetLog::TYPE_HTTP_STREAM_JOB);
(...skipping 1493 matching lines...) Expand 10 before | Expand all | Expand 10 after
1726 1725
1727 ConnectionAttempts socket_attempts = connection_->connection_attempts(); 1726 ConnectionAttempts socket_attempts = connection_->connection_attempts();
1728 if (connection_->socket()) { 1727 if (connection_->socket()) {
1729 connection_->socket()->GetConnectionAttempts(&socket_attempts); 1728 connection_->socket()->GetConnectionAttempts(&socket_attempts);
1730 } 1729 }
1731 1730
1732 delegate_->AddConnectionAttemptsToRequest(this, socket_attempts); 1731 delegate_->AddConnectionAttemptsToRequest(this, socket_attempts);
1733 } 1732 }
1734 1733
1735 } // namespace net 1734 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_network_transaction_unittest.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