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

Unified Diff: net/http/http_stream_factory_impl_request.cc

Issue 266243004: Clang format slam. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: net/http/http_stream_factory_impl_request.cc
diff --git a/net/http/http_stream_factory_impl_request.cc b/net/http/http_stream_factory_impl_request.cc
index 1eb8e51f57b9362258c1aa285e87fe1f813f2dbb..005c8fbcd37ed1e3e8c006099f98c46a24e49470 100644
--- a/net/http/http_stream_factory_impl_request.cc
+++ b/net/http/http_stream_factory_impl_request.cc
@@ -67,8 +67,8 @@ bool HttpStreamFactoryImpl::Request::SetHttpPipeliningKey(
const HttpPipelinedHost::Key& http_pipelining_key) {
CHECK(!http_pipelining_key_.get());
http_pipelining_key_.reset(new HttpPipelinedHost::Key(http_pipelining_key));
- bool was_new_key = !ContainsKey(factory_->http_pipelining_request_map_,
- http_pipelining_key);
+ bool was_new_key =
+ !ContainsKey(factory_->http_pipelining_request_map_, http_pipelining_key);
RequestVector& request_vector =
factory_->http_pipelining_request_map_[http_pipelining_key];
request_vector.push_back(this);
@@ -81,22 +81,19 @@ void HttpStreamFactoryImpl::Request::AttachJob(Job* job) {
factory_->request_map_[job] = this;
}
-void HttpStreamFactoryImpl::Request::Complete(
- bool was_npn_negotiated,
- NextProto protocol_negotiated,
- bool using_spdy,
- const BoundNetLog& job_net_log) {
+void HttpStreamFactoryImpl::Request::Complete(bool was_npn_negotiated,
+ NextProto protocol_negotiated,
+ bool using_spdy,
+ const BoundNetLog& job_net_log) {
DCHECK(!completed_);
completed_ = true;
was_npn_negotiated_ = was_npn_negotiated;
protocol_negotiated_ = protocol_negotiated;
using_spdy_ = using_spdy;
- net_log_.AddEvent(
- NetLog::TYPE_HTTP_STREAM_REQUEST_BOUND_TO_JOB,
- job_net_log.source().ToEventParametersCallback());
- job_net_log.AddEvent(
- NetLog::TYPE_HTTP_STREAM_JOB_BOUND_TO_REQUEST,
- net_log_.source().ToEventParametersCallback());
+ net_log_.AddEvent(NetLog::TYPE_HTTP_STREAM_REQUEST_BOUND_TO_JOB,
+ job_net_log.source().ToEventParametersCallback());
+ job_net_log.AddEvent(NetLog::TYPE_HTTP_STREAM_JOB_BOUND_TO_REQUEST,
+ net_log_.source().ToEventParametersCallback());
}
void HttpStreamFactoryImpl::Request::OnStreamReady(
@@ -199,7 +196,7 @@ void HttpStreamFactoryImpl::Request::OnNeedsClientAuth(
}
void HttpStreamFactoryImpl::Request::OnHttpsProxyTunnelResponse(
- Job *job,
+ Job* job,
const HttpResponseInfo& response_info,
const SSLConfig& used_ssl_config,
const ProxyInfo& used_proxy_info,
@@ -220,7 +217,8 @@ int HttpStreamFactoryImpl::Request::RestartTunnelWithProxyAuth(
void HttpStreamFactoryImpl::Request::SetPriority(RequestPriority priority) {
for (std::set<HttpStreamFactoryImpl::Job*>::const_iterator it = jobs_.begin();
- it != jobs_.end(); ++it) {
+ it != jobs_.end();
+ ++it) {
(*it)->SetPriority(priority);
}
if (bound_job_)
@@ -241,8 +239,7 @@ bool HttpStreamFactoryImpl::Request::was_npn_negotiated() const {
return was_npn_negotiated_;
}
-NextProto HttpStreamFactoryImpl::Request::protocol_negotiated()
- const {
+NextProto HttpStreamFactoryImpl::Request::protocol_negotiated() const {
DCHECK(completed_);
return protocol_negotiated_;
}
@@ -252,14 +249,12 @@ bool HttpStreamFactoryImpl::Request::using_spdy() const {
return using_spdy_;
}
-void
-HttpStreamFactoryImpl::Request::RemoveRequestFromSpdySessionRequestMap() {
+void HttpStreamFactoryImpl::Request::RemoveRequestFromSpdySessionRequestMap() {
if (spdy_session_key_.get()) {
SpdySessionRequestMap& spdy_session_request_map =
factory_->spdy_session_request_map_;
DCHECK(ContainsKey(spdy_session_request_map, *spdy_session_key_));
- RequestSet& request_set =
- spdy_session_request_map[*spdy_session_key_];
+ RequestSet& request_set = spdy_session_request_map[*spdy_session_key_];
DCHECK(ContainsKey(request_set, this));
request_set.erase(this);
if (request_set.empty())
@@ -277,7 +272,8 @@ HttpStreamFactoryImpl::Request::RemoveRequestFromHttpPipeliningRequestMap() {
RequestVector& request_vector =
http_pipelining_request_map[*http_pipelining_key_];
for (RequestVector::iterator it = request_vector.begin();
- it != request_vector.end(); ++it) {
+ it != request_vector.end();
+ ++it) {
if (*it == this) {
request_vector.erase(it);
break;
@@ -313,8 +309,7 @@ void HttpStreamFactoryImpl::Request::OnNewSpdySessionReady(
const SSLConfig used_ssl_config = job->server_ssl_config();
const ProxyInfo used_proxy_info = job->proxy_info();
const bool was_npn_negotiated = job->was_npn_negotiated();
- const NextProto protocol_negotiated =
- job->protocol_negotiated();
+ const NextProto protocol_negotiated = job->protocol_negotiated();
const bool using_spdy = job->using_spdy();
const BoundNetLog net_log = job->net_log();
@@ -327,8 +322,8 @@ void HttpStreamFactoryImpl::Request::OnNewSpdySessionReady(
// implemented.
NOTREACHED();
} else {
- delegate_->OnStreamReady(job->server_ssl_config(), job->proxy_info(),
- stream.release());
+ delegate_->OnStreamReady(
+ job->server_ssl_config(), job->proxy_info(), stream.release());
}
// |this| may be deleted after this point.
if (spdy_session) {

Powered by Google App Engine
This is Rietveld 408576698