net: rework the NPN patch.

chrome/browser/ui/webui/net_internals_ui.cc

Index: chrome/browser/ui/webui/net_internals_ui.cc
diff --git a/chrome/browser/ui/webui/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals_ui.cc
index 1b39555c364fa22a2e28c8f495aa23701b0dbd0c..77918ead903ddba22aeafdbb2c1411d557a58713 100644
--- a/chrome/browser/ui/webui/net_internals_ui.cc
+++ b/chrome/browser/ui/webui/net_internals_ui.cc
@@ -1186,10 +1186,13 @@ void NetInternalsMessageHandler::IOThreadImpl::OnGetSpdyStatus(
                        net::HttpStreamFactory::force_spdy_always()));
 
   // The next_protos may not be specified for certain configurations of SPDY.
-  Value* next_protos_value = net::HttpStreamFactory::next_protos() ?
-      Value::CreateStringValue(*net::HttpStreamFactory::next_protos()) :
-      Value::CreateStringValue("");
-
+  Value* next_protos_value;
+  if (net::HttpStreamFactory::has_next_protos()) {
+    next_protos_value = Value::CreateStringValue(
+        JoinString(net::HttpStreamFactory::next_protos(), ','));

[wtc, 2011/10/11 23:43:04]

IMPORTANT: this means the protocol strings must not contain
commas.  Is this true?  The NPN spec doesn't have the
"no commas" restriction.

[agl, 2011/10/17 17:37:24]

This is just for debugging and has a number of limitations. The spec allows the
protocols to be full, 8-bit clean strings. There are a number of ways in which
that could go wrong.

+  } else {
+    next_protos_value = Value::CreateStringValue("");
+  }
   status_dict->Set("next_protos", next_protos_value);
 
   SendJavascriptCommand(L"receivedSpdyStatus", status_dict);