Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / net / http / http_server_properties.cc

diff --git a/src/net/http/http_server_properties.cc b/src/net/http/http_server_properties.cc
index 19b334c..abc5cb1 100644 (file)
--- a/src/net/http/http_server_properties.cc
+++ b/src/net/http/http_server_properties.cc
@@ -20,7 +20,7 @@ const char* const kAlternateProtocolStrings[] = {
   "npn-spdy/2",
   "npn-spdy/3",
   "npn-spdy/3.1",
-  "npn-h2-12",  // HTTP/2 draft 12. Called SPDY4 internally.
+  "npn-h2-13",  // HTTP/2 draft 13. Called SPDY4 internally.
   "quic"
 };
 const char kBrokenAlternateProtocol[] = "Broken";
@@ -111,9 +111,10 @@ AlternateProtocol AlternateProtocolFromNextProto(NextProto next_proto) {
   return UNINITIALIZED_ALTERNATE_PROTOCOL;
 }
 
-std::string PortAlternateProtocolPair::ToString() const {
-  return base::StringPrintf("%d:%s", port,
-                            AlternateProtocolToString(protocol));
+std::string AlternateProtocolInfo::ToString() const {
+  return base::StringPrintf("%d:%s p=%f", port,
+                            AlternateProtocolToString(protocol),
+                            probability);
 }
 
 }  // namespace net