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

Unified Diff: net/http/http_stream_factory_impl_request.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_request.h ('k') | net/http/proxy_client_socket.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_request.cc
diff --git a/net/http/http_stream_factory_impl_request.cc b/net/http/http_stream_factory_impl_request.cc
index 9a5e28a1df56b8c39e02b7d10b01f0838c2b107d..2ac33542cc6d941bcc93be9004c1d4846ee2f13d 100644
--- a/net/http/http_stream_factory_impl_request.cc
+++ b/net/http/http_stream_factory_impl_request.cc
@@ -22,7 +22,7 @@ HttpStreamFactoryImpl::Request::Request(const GURL& url,
net_log_(net_log),
completed_(false),
was_npn_negotiated_(false),
- protocol_negotiated_(SSLClientSocket::kProtoUnknown),
+ protocol_negotiated_(kProtoUnknown),
using_spdy_(false) {
DCHECK(factory_);
DCHECK(delegate_);
@@ -77,7 +77,7 @@ void HttpStreamFactoryImpl::Request::AttachJob(Job* job) {
void HttpStreamFactoryImpl::Request::Complete(
bool was_npn_negotiated,
- SSLClientSocket::NextProto protocol_negotiated,
+ NextProto protocol_negotiated,
bool using_spdy,
const BoundNetLog& job_net_log) {
DCHECK(!completed_);
@@ -233,7 +233,7 @@ bool HttpStreamFactoryImpl::Request::was_npn_negotiated() const {
return was_npn_negotiated_;
}
-SSLClientSocket::NextProto HttpStreamFactoryImpl::Request::protocol_negotiated()
+NextProto HttpStreamFactoryImpl::Request::protocol_negotiated()
const {
DCHECK(completed_);
return protocol_negotiated_;
@@ -300,7 +300,7 @@ void HttpStreamFactoryImpl::Request::OnSpdySessionReady(
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 SSLClientSocket::NextProto protocol_negotiated =
+ const NextProto protocol_negotiated =
job->protocol_negotiated();
const bool using_spdy = job->using_spdy();
const BoundNetLog net_log = job->net_log();
« no previous file with comments | « net/http/http_stream_factory_impl_request.h ('k') | net/http/proxy_client_socket.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698