diff options
| author | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-31 03:58:46 +0000 |
|---|---|---|
| committer | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-31 03:58:46 +0000 |
| commit | 8e3c78cb4857505329f602e6af71a46d05346e99 (patch) | |
| tree | 0f42439dbfdea47be8189bc39d682062d071d3ec /net/http/http_stream_factory_impl_request.cc | |
| parent | 9822df966d60c67faaf4c4adacc70801aed9edaf (diff) | |
| download | chromium_src-8e3c78cb4857505329f602e6af71a46d05346e99.zip chromium_src-8e3c78cb4857505329f602e6af71a46d05346e99.tar.gz chromium_src-8e3c78cb4857505329f602e6af71a46d05346e99.tar.bz2 | |
Move NextProto enum to a new file net/socket/next_proto.h
BUG=120890
Review URL: http://codereview.chromium.org/9959033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130038 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_stream_factory_impl_request.cc')
| -rw-r--r-- | net/http/http_stream_factory_impl_request.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/http/http_stream_factory_impl_request.cc b/net/http/http_stream_factory_impl_request.cc index 9a5e28a..2ac3354 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(); |