Add a source id to global NetLog entries.

net/socket/socket_test_util.cc

 // Copyright (c) 2012 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 "net/socket/socket_test_util.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 618 matching lines @@
                               ssl_host_info, mock_ssl_data_.GetNext());
   return socket;
 }
 
 void MockClientSocketFactory::ClearSSLSessionCache() {
 }
 
 MockClientSocket::MockClientSocket(net::NetLog* net_log)
     : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
       connected_(false),
-      net_log_(net::NetLog::Source(), net_log) {
+      net_log_(BoundNetLog::Make(net_log, net::NetLog::SOURCE_NONE)) {

[eroman, 2012/03/14 21:53:48]

How do you envision the javascript side of things dealing with this?

If clients bind a netlog for emitting global entries like this (which seems like
a legitimate use-case), then that means all the entries they emit will have the
same source ID (in other words, the javascript code can't rely on each having a
unique source ID).

Actually that seems like it should be fine, we would just pay attention to the
SOURCE_NONE.

[mmenke, 2012/03/14 22:25:23]

For emitting global entries, they should generally just use
NetLog::AddGlobalEntry, rather than binding a source, so each entry will get its
own unique source.

 }
 
 bool MockClientSocket::SetReceiveBufferSize(int32 size) {
   return true;
 }
 
 bool MockClientSocket::SetSendBufferSize(int32 size) {
   return true;
 }
 
@@ skipping 550 matching lines @@
 
 MockUDPClientSocket::MockUDPClientSocket(SocketDataProvider* data,
                                          net::NetLog* net_log)
     : connected_(false),
       data_(data),
       read_offset_(0),
       read_data_(SYNCHRONOUS, ERR_UNEXPECTED),
       need_read_data_(true),
       pending_buf_(NULL),
       pending_buf_len_(0),
-      net_log_(net::NetLog::Source(), net_log),
+      net_log_(BoundNetLog::Make(net_log, net::NetLog::SOURCE_NONE)),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
   DCHECK(data_);
   data_->Reset();
 }
 
 MockUDPClientSocket::~MockUDPClientSocket() {}
 
 int MockUDPClientSocket::Read(IOBuffer* buf, int buf_len,
                               const CompletionCallback& callback) {
   if (!connected_)
@@ skipping 398 matching lines @@
 
 const char kSOCKS5OkRequest[] =
     { 0x05, 0x01, 0x00, 0x03, 0x04, 'h', 'o', 's', 't', 0x00, 0x50 };
 const int kSOCKS5OkRequestLength = arraysize(kSOCKS5OkRequest);
 
 const char kSOCKS5OkResponse[] =
     { 0x05, 0x00, 0x00, 0x01, 127, 0, 0, 1, 0x00, 0x50 };
 const int kSOCKS5OkResponseLength = arraysize(kSOCKS5OkResponse);
 
 }  // namespace net