Log server advertised protos and the selected

Log server advertised protos and the selected
next_proto to net-internals log.

In net internal logs, we will log proto in the following
manner:

(P) t=1323112212350 [st=463]     
    HTTP_STREAM_REQUEST_PROTO             
        --> next_proto_status = "negotiated"
        --> proto = "spdy/2"                
        --> server_protos = "spdy/2,http/1.1"

BUG=62064
TEST=network unit tests
R=willchan

The following was the original CL:
http://codereview.chromium.org/8676046/
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=113052

[ramant (doing other things), 2011-12-03 21:51:12]

Hi willchan and agl,
  Made the changes to log server proto. Would appreciate your comments.

thanks,
raman

[agl, 2011-12-05 16:10:14]

I'm afraid that I don't currently have a real computer abd I've discovered that
using codereview from a phone doesn't work. I will review this as soon as I am
able. Sorry!

[agl, 2011-12-05 16:38:09]

Almost every comment is s/proto/protos/ so I've stopped half-way. The server
advertises several protocols, even if they are sometimes serialised into a
single string.

Once that's changed, then I think it'll be a very easy review. Cheers

http://codereview.chromium.org/8787011/diff/6003/net/base/net_log_event_type_...
File net/base/net_log_event_type_list.h (right):

http://codereview.chromium.org/8787011/diff/6003/net/base/net_log_event_type_...
net/base/net_log_event_type_list.h:805: //      "status": <The NextProtoStatus
of proto>,
<The NPN status ("negotiated", "unsupported", "no-overlap")>

http://codereview.chromium.org/8787011/diff/6003/net/base/net_log_event_type_...
net/base/net_log_event_type_list.h:806: //      "proto": <String of the proto
negotiated>,
<The NPN protocol negotiated>

http://codereview.chromium.org/8787011/diff/6003/net/base/net_log_event_type_...
net/base/net_log_event_type_list.h:807: //      "server_proto": <String of the
server proto>,
The list of server advertised protocols

http://codereview.chromium.org/8787011/diff/6003/net/base/net_log_event_type_...
net/base/net_log_event_type_list.h:807: //      "server_proto": <String of the
server proto>,
s/server_proto/server_protos/

http://codereview.chromium.org/8787011/diff/6003/net/http/http_stream_factory...
File net/http/http_stream_factory_impl_job.cc (right):

http://codereview.chromium.org/8787011/diff/6003/net/http/http_stream_factory...
net/http/http_stream_factory_impl_job.cc:74: const std::string& server_proto) {
s/server_proto/server_protos/

http://codereview.chromium.org/8787011/diff/6003/net/http/http_stream_factory...
net/http/http_stream_factory_impl_job.cc:76: status, proto, server_proto));
s/server_proto/server_protos/

http://codereview.chromium.org/8787011/diff/6003/net/http/http_stream_factory...
net/http/http_stream_factory_impl_job.cc:84: const std::string& server_proto)
s/server_proto/server_protos/

(and the rest.)

http://codereview.chromium.org/8787011/diff/6003/net/http/http_stream_factory...
net/http/http_stream_factory_impl_job.cc:100: dict->SetString("server_proto",
s/server_proto/server_protos/

http://codereview.chromium.org/8787011/diff/6003/net/http/http_stream_factory...
net/http/http_stream_factory_impl_job.cc:101:
SSLClientSocket::ServerProtoToString(server_proto_));
s/Proto/Protos/
s/server_proto_/server_protos_/

http://codereview.chromium.org/8787011/diff/6003/net/http/http_stream_factory...
net/http/http_stream_factory_impl_job.cc:752: std::string server_proto;
server_protos

http://codereview.chromium.org/8787011/diff/6003/net/socket/socket_test_util.cc
File net/socket/socket_test_util.cc (right):

http://codereview.chromium.org/8787011/diff/6003/net/socket/socket_test_util....
net/socket/socket_test_util.cc:1158: std::string* proto, std::string*
server_proto) {
s

http://codereview.chromium.org/8787011/diff/6003/net/socket/socket_test_util....
net/socket/socket_test_util.cc:1160: *server_proto = data_->protos;
s

http://codereview.chromium.org/8787011/diff/6003/net/socket/socket_test_util.h
File net/socket/socket_test_util.h (right):

http://codereview.chromium.org/8787011/diff/6003/net/socket/socket_test_util....
net/socket/socket_test_util.h:266: std::string protos;  // server proto.
server_protos

http://codereview.chromium.org/8787011/diff/6003/net/socket/socket_test_util....
net/socket/socket_test_util.h:615: std::string* server_proto) OVERRIDE;
protos

http://codereview.chromium.org/8787011/diff/6003/net/socket/socket_test_util....
net/socket/socket_test_util.h:758: std::string* server_proto) OVERRIDE;
s

http://codereview.chromium.org/8787011/diff/6003/net/socket/ssl_client_socket.cc
File net/socket/ssl_client_socket.cc (right):

http://codereview.chromium.org/8787011/diff/6003/net/socket/ssl_client_socket...
net/socket/ssl_client_socket.cc:34: return "Unsupported";
"unsupported"

http://codereview.chromium.org/8787011/diff/6003/net/socket/ssl_client_socket...
net/socket/ssl_client_socket.cc:36: return "Negotiated";
"negotiated"

http://codereview.chromium.org/8787011/diff/6003/net/socket/ssl_client_socket...
net/socket/ssl_client_socket.cc:38: return "No overlap";
"no-overlap"

http://codereview.chromium.org/8787011/diff/6003/net/socket/ssl_client_socket...
net/socket/ssl_client_socket.cc:45: const std::string& server_proto) {
s

http://codereview.chromium.org/8787011/diff/6003/net/socket/ssl_client_socket.h
File net/socket/ssl_client_socket.h (right):

http://codereview.chromium.org/8787011/diff/6003/net/socket/ssl_client_socket...
net/socket/ssl_client_socket.h:125: std::string* server_proto) = 0;
s

http://codereview.chromium.org/8787011/diff/6003/net/socket/ssl_client_socket...
net/socket/ssl_client_socket.h:132: static std::string ServerProtoToString(const
std::string& server_proto);
Protos, server_protos

http://codereview.chromium.org/8787011/diff/6003/net/socket/ssl_client_socket...
File net/socket/ssl_client_socket_mac.cc (right):

http://codereview.chromium.org/8787011/diff/6003/net/socket/ssl_client_socket...
net/socket/ssl_client_socket_mac.cc:796: std::string* server_proto) {
s

http://codereview.chromium.org/8787011/diff/6003/net/socket/ssl_client_socket...
net/socket/ssl_client_socket_mac.cc:798: server_proto->clear();
s

http://codereview.chromium.org/8787011/diff/6003/net/socket/ssl_client_socket...
File net/socket/ssl_client_socket_mac.h (right):

http://codereview.chromium.org/8787011/diff/6003/net/socket/ssl_client_socket...
net/socket/ssl_client_socket_mac.h:52: std::string* server_proto) OVERRIDE;
s

http://codereview.chromium.org/8787011/diff/6003/net/socket/ssl_client_socket...
File net/socket/ssl_client_socket_nss.cc (right):

http://codereview.chromium.org/8787011/diff/6003/net/socket/ssl_client_socket...
net/socket/ssl_client_socket_nss.cc:560: std::string* server_proto) {
s

http://codereview.chromium.org/8787011/diff/6003/net/socket/ssl_client_socket...
File net/socket/ssl_client_socket_nss.h (right):

http://codereview.chromium.org/8787011/diff/6003/net/socket/ssl_client_socket...
net/socket/ssl_client_socket_nss.h:71: std::string* server_proto) OVERRIDE;
s

http://codereview.chromium.org/8787011/diff/6003/net/socket/ssl_client_socket...
net/socket/ssl_client_socket_nss.h:304: // Server's NPN advertised proto.
protocols.

http://codereview.chromium.org/8787011/diff/6003/net/socket/ssl_client_socket...
net/socket/ssl_client_socket_nss.h:305: std::string protos_;
server_protos_

[ramant (doing other things), 2011-12-05 19:03:28]

Many many thanks agl. Changed all server_proto to server_protos, ServerProto to
ServerProtos and protos_ to server_protos_. Would appreciate if you could take
another look.

thanks much,
raman

http://codereview.chromium.org/8787011/diff/6003/net/base/net_log_event_type_...
File net/base/net_log_event_type_list.h (right):

http://codereview.chromium.org/8787011/diff/6003/net/base/net_log_event_type_...
net/base/net_log_event_type_list.h:805: //      "status": <The NextProtoStatus
of proto>,
On 2011/12/05 16:38:10, agl wrote:
> <The NPN status ("negotiated", "unsupported", "no-overlap")>

Done.

http://codereview.chromium.org/8787011/diff/6003/net/base/net_log_event_type_...
net/base/net_log_event_type_list.h:806: //      "proto": <String of the proto
negotiated>,
On 2011/12/05 16:38:10, agl wrote:
> <The NPN protocol negotiated>

Done.

http://codereview.chromium.org/8787011/diff/6003/net/base/net_log_event_type_...
net/base/net_log_event_type_list.h:807: //      "server_proto": <String of the
server proto>,
On 2011/12/05 16:38:10, agl wrote:
> The list of server advertised protocols

Done.

http://codereview.chromium.org/8787011/diff/6003/net/base/net_log_event_type_...
net/base/net_log_event_type_list.h:807: //      "server_proto": <String of the
server proto>,
On 2011/12/05 16:38:10, agl wrote:
> The list of server advertised protocols

Done.

http://codereview.chromium.org/8787011/diff/6003/net/http/http_stream_factory...
File net/http/http_stream_factory_impl_job.cc (right):

http://codereview.chromium.org/8787011/diff/6003/net/http/http_stream_factory...
net/http/http_stream_factory_impl_job.cc:74: const std::string& server_proto) {
On 2011/12/05 16:38:10, agl wrote:
> s/server_proto/server_protos/

Done.

http://codereview.chromium.org/8787011/diff/6003/net/http/http_stream_factory...
net/http/http_stream_factory_impl_job.cc:76: status, proto, server_proto));
On 2011/12/05 16:38:10, agl wrote:
> s/server_proto/server_protos/

Done.

http://codereview.chromium.org/8787011/diff/6003/net/http/http_stream_factory...
net/http/http_stream_factory_impl_job.cc:84: const std::string& server_proto)
On 2011/12/05 16:38:10, agl wrote:
> s/server_proto/server_protos/
> 
> (and the rest.)

Done.

http://codereview.chromium.org/8787011/diff/6003/net/http/http_stream_factory...
net/http/http_stream_factory_impl_job.cc:100: dict->SetString("server_proto",
On 2011/12/05 16:38:10, agl wrote:
> s/server_proto/server_protos/

Done.

http://codereview.chromium.org/8787011/diff/6003/net/http/http_stream_factory...
net/http/http_stream_factory_impl_job.cc:101:
SSLClientSocket::ServerProtoToString(server_proto_));
On 2011/12/05 16:38:10, agl wrote:
> s/Proto/Protos/
> s/server_proto_/server_protos_/

Done.

http://codereview.chromium.org/8787011/diff/6003/net/http/http_stream_factory...
net/http/http_stream_factory_impl_job.cc:752: std::string server_proto;
On 2011/12/05 16:38:10, agl wrote:
> server_protos

Done.

http://codereview.chromium.org/8787011/diff/6003/net/socket/socket_test_util.cc
File net/socket/socket_test_util.cc (right):

http://codereview.chromium.org/8787011/diff/6003/net/socket/socket_test_util....
net/socket/socket_test_util.cc:1158: std::string* proto, std::string*
server_proto) {
On 2011/12/05 16:38:10, agl wrote:
> s

Done.

http://codereview.chromium.org/8787011/diff/6003/net/socket/socket_test_util....
net/socket/socket_test_util.cc:1160: *server_proto = data_->protos;
On 2011/12/05 16:38:10, agl wrote:
> s

Done.

http://codereview.chromium.org/8787011/diff/6003/net/socket/socket_test_util.h
File net/socket/socket_test_util.h (right):

http://codereview.chromium.org/8787011/diff/6003/net/socket/socket_test_util....
net/socket/socket_test_util.h:266: std::string protos;  // server proto.
On 2011/12/05 16:38:10, agl wrote:
> server_protos

Done.

http://codereview.chromium.org/8787011/diff/6003/net/socket/socket_test_util....
net/socket/socket_test_util.h:615: std::string* server_proto) OVERRIDE;
On 2011/12/05 16:38:10, agl wrote:
> protos

Done.

http://codereview.chromium.org/8787011/diff/6003/net/socket/socket_test_util....
net/socket/socket_test_util.h:758: std::string* server_proto) OVERRIDE;
On 2011/12/05 16:38:10, agl wrote:
> s

Done.

http://codereview.chromium.org/8787011/diff/6003/net/socket/ssl_client_socket.cc
File net/socket/ssl_client_socket.cc (right):

http://codereview.chromium.org/8787011/diff/6003/net/socket/ssl_client_socket...
net/socket/ssl_client_socket.cc:34: return "Unsupported";
On 2011/12/05 16:38:10, agl wrote:
> "unsupported"

Done.

http://codereview.chromium.org/8787011/diff/6003/net/socket/ssl_client_socket...
net/socket/ssl_client_socket.cc:36: return "Negotiated";
On 2011/12/05 16:38:10, agl wrote:
> "negotiated"

Done.

http://codereview.chromium.org/8787011/diff/6003/net/socket/ssl_client_socket...
net/socket/ssl_client_socket.cc:38: return "No overlap";
On 2011/12/05 16:38:10, agl wrote:
> "no-overlap"

Done.

http://codereview.chromium.org/8787011/diff/6003/net/socket/ssl_client_socket...
net/socket/ssl_client_socket.cc:45: const std::string& server_proto) {
On 2011/12/05 16:38:10, agl wrote:
> s

Done.

http://codereview.chromium.org/8787011/diff/6003/net/socket/ssl_client_socket.h
File net/socket/ssl_client_socket.h (right):

http://codereview.chromium.org/8787011/diff/6003/net/socket/ssl_client_socket...
net/socket/ssl_client_socket.h:125: std::string* server_proto) = 0;
On 2011/12/05 16:38:10, agl wrote:
> s

Done.

http://codereview.chromium.org/8787011/diff/6003/net/socket/ssl_client_socket...
net/socket/ssl_client_socket.h:132: static std::string ServerProtoToString(const
std::string& server_proto);
On 2011/12/05 16:38:10, agl wrote:
> Protos, server_protos

Done.

http://codereview.chromium.org/8787011/diff/6003/net/socket/ssl_client_socket...
File net/socket/ssl_client_socket_mac.cc (right):

http://codereview.chromium.org/8787011/diff/6003/net/socket/ssl_client_socket...
net/socket/ssl_client_socket_mac.cc:796: std::string* server_proto) {
On 2011/12/05 16:38:10, agl wrote:
> s

Done.

http://codereview.chromium.org/8787011/diff/6003/net/socket/ssl_client_socket...
net/socket/ssl_client_socket_mac.cc:798: server_proto->clear();
On 2011/12/05 16:38:10, agl wrote:
> s

Done.

http://codereview.chromium.org/8787011/diff/6003/net/socket/ssl_client_socket...
File net/socket/ssl_client_socket_mac.h (right):

http://codereview.chromium.org/8787011/diff/6003/net/socket/ssl_client_socket...
net/socket/ssl_client_socket_mac.h:52: std::string* server_proto) OVERRIDE;
On 2011/12/05 16:38:10, agl wrote:
> s

Done.

http://codereview.chromium.org/8787011/diff/6003/net/socket/ssl_client_socket...
File net/socket/ssl_client_socket_nss.cc (right):

http://codereview.chromium.org/8787011/diff/6003/net/socket/ssl_client_socket...
net/socket/ssl_client_socket_nss.cc:560: std::string* server_proto) {
On 2011/12/05 16:38:10, agl wrote:
> s

Done.

http://codereview.chromium.org/8787011/diff/6003/net/socket/ssl_client_socket...
File net/socket/ssl_client_socket_nss.h (right):

http://codereview.chromium.org/8787011/diff/6003/net/socket/ssl_client_socket...
net/socket/ssl_client_socket_nss.h:71: std::string* server_proto) OVERRIDE;
On 2011/12/05 16:38:10, agl wrote:
> s

Done.

http://codereview.chromium.org/8787011/diff/6003/net/socket/ssl_client_socket...
net/socket/ssl_client_socket_nss.h:304: // Server's NPN advertised proto.
On 2011/12/05 16:38:10, agl wrote:
> protocols.

Done.

http://codereview.chromium.org/8787011/diff/6003/net/socket/ssl_client_socket...
net/socket/ssl_client_socket_nss.h:305: std::string protos_;
On 2011/12/05 16:38:10, agl wrote:
> server_protos_

Done.

[agl, 2011-12-05 20:00:53]

lgtm

http://codereview.chromium.org/8787011/diff/10001/net/socket/ssl_client_socket.h
File net/socket/ssl_client_socket.h (right):

http://codereview.chromium.org/8787011/diff/10001/net/socket/ssl_client_socke...
net/socket/ssl_client_socket.h:123: //                          supported list.
I think it's worth extending this comment to mention the second argument.

http://codereview.chromium.org/8787011/diff/10001/net/socket/ssl_client_socke...
net/socket/ssl_client_socket.h:132: static std::string
ServerProtosToString(const std::string& server_protos);
I would mention that this can be used with the second argument of |GetNextProto|
to construct a comma separated string.

[willchan no longer on Chromium, 2011-12-05 20:06:41]

lgtm

[ramant (doing other things), 2011-12-05 22:08:24]

Made the changes agl has suggested.

http://codereview.chromium.org/8787011/diff/10001/net/socket/ssl_client_socket.h
File net/socket/ssl_client_socket.h (right):

http://codereview.chromium.org/8787011/diff/10001/net/socket/ssl_client_socke...
net/socket/ssl_client_socket.h:123: //                          supported list.
On 2011/12/05 20:00:54, agl wrote:
> I think it's worth extending this comment to mention the second argument.

Done.

http://codereview.chromium.org/8787011/diff/10001/net/socket/ssl_client_socke...
net/socket/ssl_client_socket.h:132: static std::string
ServerProtosToString(const std::string& server_protos);
On 2011/12/05 20:00:54, agl wrote:
> I would mention that this can be used with the second argument of
|GetNextProto|
> to construct a comma separated string.

Done.

[commit-bot: I haz the power, 2011-12-05 22:10:33]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/rtenneti@chromium.org/8787011/19004