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 6b358bfba46d65774ce785f6cd65f6ed262b8ce7..091dbae655fcc77d3b5507309ab4e64c420507d3 100644
--- a/chrome/browser/ui/webui/net_internals_ui.cc
+++ b/chrome/browser/ui/webui/net_internals_ui.cc
@@ -1199,10 +1199,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(), ','));
+  } else {
+    next_protos_value = Value::CreateStringValue("");
+  }

[wtc, 2011/10/05 23:34:25]

Just wanted to doublecheck: you intentionally replace the
tertiary ? : expression with an if-else statement for better
readability, right?

[agl, 2011/10/07 19:19:17]

Yes

   status_dict->Set("next_protos", next_protos_value);
 
   SendJavascriptCommand(L"receivedSpdyStatus", status_dict);