net: rework the NPN patch.

chrome/browser/ui/webui/net_internals_ui.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/net_internals_ui.h"
 
 #include <algorithm>
 #include <list>
 #include <string>
 #include <utility>
@@ skipping 1168 matching lines @@
                    Value::CreateBooleanValue(
                        net::HttpStreamFactory::use_alternate_protocols()));
   status_dict->Set("force_spdy_over_ssl",
                    Value::CreateBooleanValue(
                        net::HttpStreamFactory::force_spdy_over_ssl()));
   status_dict->Set("force_spdy_always",
                    Value::CreateBooleanValue(
                        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);
 }
 
 void
 NetInternalsMessageHandler::IOThreadImpl::OnGetSpdyAlternateProtocolMappings(
     const ListValue* list) {
   net::HttpNetworkSession* http_network_session =
       GetHttpNetworkSession(context_getter_->GetURLRequestContext());
@@ skipping 343 matching lines @@
   return constants_dict;
 }
 
 NetInternalsUI::NetInternalsUI(TabContents* contents) : ChromeWebUI(contents) {
   AddMessageHandler((new NetInternalsMessageHandler())->Attach(this));
 
   // Set up the chrome://net-internals/ source.
   GetProfile()->GetChromeURLDataManager()->AddDataSource(
       CreateNetInternalsHTMLSource());
 }