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

net/socket/socket_test_util.h

 // Copyright (c) 2009 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.
 
 #ifndef NET_SOCKET_SOCKET_TEST_UTIL_H_
 #define NET_SOCKET_SOCKET_TEST_UTIL_H_
 
 #include <deque>
 #include <string>
 #include <vector>
@@ skipping 17 matching lines @@
 
 enum {
   // A private network error code used by the socket test utility classes.
   // If the |result| member of a MockRead is
   // ERR_TEST_PEER_CLOSE_AFTER_NEXT_MOCK_READ, that MockRead is just a
   // marker that indicates the peer will close the connection after the next
   // MockRead.  The other members of that MockRead are ignored.
   ERR_TEST_PEER_CLOSE_AFTER_NEXT_MOCK_READ = -10000,
 };
 
+class BoundNetLog;
 class ClientSocket;
-class LoadLog;
 class MockClientSocket;
 class SSLClientSocket;
 
 struct MockConnect {
   // Asynchronous connection success.
   MockConnect() : async(true), result(OK) { }
   MockConnect(bool a, int r) : async(a), result(r) { }
 
   bool async;
   int result;
@@ skipping 215 matching lines @@
   // Store pointers to handed out sockets in case the test wants to get them.
   std::vector<MockTCPClientSocket*> tcp_client_sockets_;
   std::vector<MockSSLClientSocket*> ssl_client_sockets_;
 };
 
 class MockClientSocket : public net::SSLClientSocket {
  public:
   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;
   virtual int GetPeerAddress(AddressList* address) const;
 
   // SSLClientSocket methods:
   virtual void GetSSLInfo(net::SSLInfo* ssl_info);
   virtual void GetSSLCertRequestInfo(
       net::SSLCertRequestInfo* cert_request_info);
   virtual NextProtoStatus GetNextProto(std::string* proto);
@@ skipping 23 matching lines @@
   bool connected_;
 };
 
 class MockTCPClientSocket : public MockClientSocket {
  public:
   MockTCPClientSocket(const net::AddressList& addresses,
                       net::SocketDataProvider* socket);
 
   // 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(); }
 
   // Socket methods:
   virtual int Read(net::IOBuffer* buf, int buf_len,
                    net::CompletionCallback* callback);
   virtual int Write(net::IOBuffer* buf, int buf_len,
                     net::CompletionCallback* callback);
 
   virtual void OnReadComplete(const MockRead& data);
@@ skipping 25 matching lines @@
  public:
   MockSSLClientSocket(
       net::ClientSocket* transport_socket,
       const std::string& hostname,
       const net::SSLConfig& ssl_config,
       net::SSLSocketDataProvider* socket);
   ~MockSSLClientSocket();
 
   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:
   virtual int Read(net::IOBuffer* buf, int buf_len,
                    net::CompletionCallback* callback);
   virtual int Write(net::IOBuffer* buf, int buf_len,
                     net::CompletionCallback* callback);
 
   // This MockSocket does not implement the manual async IO feature.
   virtual void OnReadComplete(const MockRead& data) { NOTIMPLEMENTED(); }
@@ skipping 74 matching lines @@
   void ReleaseAllConnections(KeepAlive keep_alive);
 
   ScopedVector<TestSocketRequest> requests_;
   std::vector<TestSocketRequest*> request_order_;
   size_t completion_count_;
 };
 
 }  // namespace net
 
 #endif  // NET_SOCKET_SOCKET_TEST_UTIL_H_