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

Unified Diff: net/http/http_stream_factory_impl_job.cc

Issue 9959033: Move NextProto enum to a new file net/socket/next_proto.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address wtc's comments Created 8 years, 9 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
« no previous file with comments | « net/http/http_stream_factory_impl_job.h ('k') | net/http/http_stream_factory_impl_request.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_stream_factory_impl_job.cc
diff --git a/net/http/http_stream_factory_impl_job.cc b/net/http/http_stream_factory_impl_job.cc
index e75b376e5a9da84885c4e89ab682f6dd339ff4a3..f3ebf4a6027ccd65f58c6889cc64bd549dc67b5d 100644
--- a/net/http/http_stream_factory_impl_job.cc
+++ b/net/http/http_stream_factory_impl_job.cc
@@ -131,7 +131,7 @@ HttpStreamFactoryImpl::Job::Job(HttpStreamFactoryImpl* stream_factory,
spdy_certificate_error_(OK),
establishing_tunnel_(false),
was_npn_negotiated_(false),
- protocol_negotiated_(SSLClientSocket::kProtoUnknown),
+ protocol_negotiated_(kProtoUnknown),
num_streams_(0),
spdy_session_direct_(false),
existing_available_pipeline_(false),
@@ -247,7 +247,7 @@ bool HttpStreamFactoryImpl::Job::was_npn_negotiated() const {
return was_npn_negotiated_;
}
-SSLClientSocket::NextProto HttpStreamFactoryImpl::Job::protocol_negotiated()
+NextProto HttpStreamFactoryImpl::Job::protocol_negotiated()
const {
return protocol_negotiated_;
}
@@ -791,7 +791,7 @@ int HttpStreamFactoryImpl::Job::DoInitConnectionComplete(int result) {
std::string server_protos;
SSLClientSocket::NextProtoStatus status =
ssl_socket->GetNextProto(&proto, &server_protos);
- SSLClientSocket::NextProto protocol_negotiated =
+ NextProto protocol_negotiated =
SSLClientSocket::NextProtoFromString(proto);
protocol_negotiated_ = protocol_negotiated;
net_log_.AddEvent(
« no previous file with comments | « net/http/http_stream_factory_impl_job.h ('k') | net/http/http_stream_factory_impl_request.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698