Rework the logging for sockets/connectjobs.

In particular, make it work better when using backup jobs / late binding (the display was very confused before because of how these asynchronous events would nest).

Also changed the paradigm for how PassiveLogCollector preserves these async associations -- this fixes how it replays the events to net-internals. (Before we would collapse the event streams into the SOURCE_URL_REQUEST which lost some hiearchy.. now I keep the separate streams).

Some of the particular changes to the event streams:

* ConnectJobs now create their own source stream internally.
* Sockets are now bounded by +SOCKET_ALIVE / -SOCKET_ALIVE events (removed the one-off SOCKET_DONE event).
* The socket log streams contains +SOCKET_IN_USE / -SOCKET_IN_USE event blocks to show which URLRequest was controlling it at various points in time (this makes it much easier to understand which read/writes belonged to a particular network transaction when a socket gets re-used).
* ConnectJobs are bounded by +SOCKET_POOL_CONNECT_JOB / - SOCKET_POOL_CONNECT_JOB events.
* ConnectJobs log the net error they failed with.
* Removed the SOCKET_BACKUP_TIMER_EXTENDED event.
Review URL: http://codereview.chromium.org/2363003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48797 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 7 deletions

diff --git a/net/socket/socks_client_socket_pool.h b/net/socket/socks_client_socket_pool.h
index ea162245..bd975ba 100644
--- a/net/socket/socks_client_socket_pool.h
+++ b/net/socket/socks_client_socket_pool.h
@@ -41,7 +41,7 @@ class SOCKSSocketParams {
 
   const TCPSocketParams& tcp_params() const { return tcp_params_; }
   const HostResolver::RequestInfo& destination() const { return destination_; }
-  bool is_socks_v5() const { return socks_v5_; };
+  bool is_socks_v5() const { return socks_v5_; }
 
  private:
   // The tcp connection must point toward the proxy server.
@@ -61,7 +61,7 @@ class SOCKSConnectJob : public ConnectJob {
                   const scoped_refptr<TCPClientSocketPool>& tcp_pool,
                   const scoped_refptr<HostResolver> &host_resolver,
                   Delegate* delegate,
-                  const BoundNetLog& net_log);
+                  NetLog* net_log);
   virtual ~SOCKSConnectJob();
 
   // ConnectJob methods.
@@ -111,7 +111,8 @@ class SOCKSClientSocketPool : public ClientSocketPool {
       const scoped_refptr<ClientSocketPoolHistograms>& histograms,
       const scoped_refptr<HostResolver>& host_resolver,
       const scoped_refptr<TCPClientSocketPool>& tcp_pool,
-      NetworkChangeNotifier* network_change_notifier);
+      NetworkChangeNotifier* network_change_notifier,
+      NetLog* net_log);
 
   // ClientSocketPool methods:
   virtual int RequestSocket(const std::string& group_name,
@@ -155,9 +156,11 @@ class SOCKSClientSocketPool : public ClientSocketPool {
   class SOCKSConnectJobFactory : public PoolBase::ConnectJobFactory {
    public:
     SOCKSConnectJobFactory(const scoped_refptr<TCPClientSocketPool>& tcp_pool,
-                           HostResolver* host_resolver)
+                           HostResolver* host_resolver,
+                           NetLog* net_log)
         : tcp_pool_(tcp_pool),
-          host_resolver_(host_resolver) {}
+          host_resolver_(host_resolver),
+          net_log_(net_log) {}
 
     virtual ~SOCKSConnectJobFactory() {}
 
@@ -165,14 +168,14 @@ class SOCKSClientSocketPool : public ClientSocketPool {
     virtual ConnectJob* NewConnectJob(
         const std::string& group_name,
         const PoolBase::Request& request,
-        ConnectJob::Delegate* delegate,
-        const BoundNetLog& net_log) const;
+        ConnectJob::Delegate* delegate) const;
 
     virtual base::TimeDelta ConnectionTimeout() const;
 
    private:
     const scoped_refptr<TCPClientSocketPool> tcp_pool_;
     const scoped_refptr<HostResolver> host_resolver_;
+    NetLog* net_log_;
 
     DISALLOW_COPY_AND_ASSIGN(SOCKSConnectJobFactory);
   };