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

Unified Diff: net/spdy/spdy_http_stream.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/socket/stream_socket.h ('k') | net/spdy/spdy_http_stream_spdy2_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_http_stream.cc
diff --git a/net/spdy/spdy_http_stream.cc b/net/spdy/spdy_http_stream.cc
index b796e688beb69f98abdd52442c8dba664522eda0..e6b83c577d1a17d04f818cdcff108ac8c2415851 100644
--- a/net/spdy/spdy_http_stream.cc
+++ b/net/spdy/spdy_http_stream.cc
@@ -357,8 +357,7 @@ int SpdyHttpStream::OnResponseReceived(const SpdyHeaderBlock& response,
// Don't store the SSLInfo in the response here, HttpNetworkTransaction
// will take care of that part.
SSLInfo ssl_info;
- SSLClientSocket::NextProto protocol_negotiated =
- SSLClientSocket::kProtoUnknown;
+ NextProto protocol_negotiated = kProtoUnknown;
stream_->GetSSLInfo(&ssl_info,
&response_info_->was_npn_negotiated,
&protocol_negotiated);
@@ -493,8 +492,7 @@ void SpdyHttpStream::DoCallback(int rv) {
void SpdyHttpStream::GetSSLInfo(SSLInfo* ssl_info) {
DCHECK(stream_);
bool using_npn;
- SSLClientSocket::NextProto protocol_negotiated =
- SSLClientSocket::kProtoUnknown;
+ NextProto protocol_negotiated = kProtoUnknown;
stream_->GetSSLInfo(ssl_info, &using_npn, &protocol_negotiated);
}
« no previous file with comments | « net/socket/stream_socket.h ('k') | net/spdy/spdy_http_stream_spdy2_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698