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

Unified Diff: net/log/net_log_util.cc

Issue 2496953002: Revert of Unify enum NextProto and enum AlternateProtocol. (Closed)
Patch Set: Created 4 years, 1 month 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_unittest.cc ('k') | net/net.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/log/net_log_util.cc
diff --git a/net/log/net_log_util.cc b/net/log/net_log_util.cc
index 1633e529110d3886544ca85ce5f939f0f2ab8d1e..763e5892d9369fb2360c9cc72d7047ba7f1f8c37 100644
--- a/net/log/net_log_util.cc
+++ b/net/log/net_log_util.cc
@@ -39,7 +39,7 @@
#include "net/proxy/proxy_service.h"
#include "net/quic/core/quic_protocol.h"
#include "net/quic/core/quic_utils.h"
-#include "net/socket/next_proto.h"
+#include "net/socket/ssl_client_socket.h"
#include "net/url_request/url_request.h"
#include "net/url_request/url_request_context.h"
@@ -446,7 +446,7 @@
for (NextProto proto : alpn_protos) {
if (!next_protos_string.empty())
next_protos_string.append(",");
- next_protos_string.append(NextProtoToString(proto));
+ next_protos_string.append(SSLClientSocket::NextProtoToString(proto));
}
status_dict->SetString("alpn_protos", next_protos_string);
}
« no previous file with comments | « net/http/http_stream_factory_impl_unittest.cc ('k') | net/net.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698