Landing Recent QUIC changes until Mon Nov 14 04:43:50 2016 +0000

net/log/net_log_util.cc

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..c91f9313b167a3e16cca4c85dd87ae0988562d3c 100644
--- a/net/log/net_log_util.cc
+++ b/net/log/net_log_util.cc
@@ -37,9 +37,9 @@
 #include "net/proxy/proxy_config.h"
 #include "net/proxy/proxy_retry_info.h"
 #include "net/proxy/proxy_service.h"
+#include "net/quic/core/quic_error_codes.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"
 
@@ -213,8 +213,7 @@ std::unique_ptr<base::DictionaryValue> GetNetConstants() {
 
     for (QuicErrorCode error = QUIC_NO_ERROR; error < QUIC_LAST_ERROR;
          error = static_cast<QuicErrorCode>(error + 1)) {
-      dict->SetInteger(QuicUtils::ErrorToString(error),
-                       static_cast<int>(error));
+      dict->SetInteger(QuicErrorCodeToString(error), static_cast<int>(error));
     }
 
     constants_dict->Set("quicError", std::move(dict));
@@ -228,7 +227,7 @@ std::unique_ptr<base::DictionaryValue> GetNetConstants() {
     for (QuicRstStreamErrorCode error = QUIC_STREAM_NO_ERROR;
          error < QUIC_STREAM_LAST_ERROR;
          error = static_cast<QuicRstStreamErrorCode>(error + 1)) {
-      dict->SetInteger(QuicUtils::StreamErrorToString(error),
+      dict->SetInteger(QuicRstStreamErrorCodeToString(error),
                        static_cast<int>(error));
     }