Generalize the net module's LoadLog facility from a passive container, to an event stream (NetLog).

This makes it possible to associate a single NetLog with a URLRequestContext, and then attach observers to that log to watch the stream of events.

This changelist attempts to do the most direct translation, so there will be subsequent iterations to clean up.

The user-visible behavior should remain unchanged.

BUG=37421

Review URL: http://codereview.chromium.org/848006

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

1 files changed, 6 insertions, 4 deletions

diff --git a/net/socket/socket_test_util.h b/net/socket/socket_test_util.h
index e2f3504..69b78da 100644
--- a/net/socket/socket_test_util.h
+++ b/net/socket/socket_test_util.h
@@ -35,8 +35,8 @@ enum {
   ERR_TEST_PEER_CLOSE_AFTER_NEXT_MOCK_READ = -10000,
 };
 
+class BoundNetLog;
 class ClientSocket;
-class LoadLog;
 class MockClientSocket;
 class SSLClientSocket;
 
@@ -272,7 +272,8 @@ class MockClientSocket : public net::SSLClientSocket {
   MockClientSocket();
 
   // ClientSocket methods:
-  virtual int Connect(net::CompletionCallback* callback, LoadLog* load_log) = 0;
+  virtual int Connect(net::CompletionCallback* callback,
+                      const BoundNetLog& net_log) = 0;
   virtual void Disconnect();
   virtual bool IsConnected() const;
   virtual bool IsConnectedAndIdle() const;
@@ -316,7 +317,7 @@ class MockTCPClientSocket : public MockClientSocket {
 
   // ClientSocket methods:
   virtual int Connect(net::CompletionCallback* callback,
-                      LoadLog* load_log);
+                      const BoundNetLog& net_log);
   virtual bool IsConnected() const;
   virtual bool IsConnectedAndIdle() const { return IsConnected(); }
 
@@ -362,7 +363,8 @@ class MockSSLClientSocket : public MockClientSocket {
 
   virtual void GetSSLInfo(net::SSLInfo* ssl_info);
 
-  virtual int Connect(net::CompletionCallback* callback, LoadLog* load_log);
+  virtual int Connect(net::CompletionCallback* callback,
+                      const BoundNetLog& net_log);
   virtual void Disconnect();
 
   // Socket methods: