| Index: net/socket/socket_test_util.h
 | 
| ===================================================================
 | 
| --- net/socket/socket_test_util.h	(revision 90388)
 | 
| +++ net/socket/socket_test_util.h	(working copy)
 | 
| @@ -631,8 +631,6 @@
 | 
|    virtual int GetPeerAddress(AddressList* address) const;
 | 
|    virtual bool WasEverUsed() const;
 | 
|    virtual bool UsingTCPFastOpen() const;
 | 
| -  virtual int64 NumBytesRead() const;
 | 
| -  virtual base::TimeDelta GetConnectTimeMicros() const;
 | 
|  
 | 
|    // MockClientSocket:
 | 
|    virtual void OnReadComplete(const MockRead& data);
 | 
| @@ -644,7 +642,6 @@
 | 
|  
 | 
|    net::SocketDataProvider* data_;
 | 
|    int read_offset_;
 | 
| -  int num_bytes_read_;
 | 
|    net::MockRead read_data_;
 | 
|    bool need_read_data_;
 | 
|  
 | 
| @@ -686,8 +683,6 @@
 | 
|    virtual bool IsConnectedAndIdle() const;
 | 
|    virtual bool WasEverUsed() const;
 | 
|    virtual bool UsingTCPFastOpen() const;
 | 
| -  virtual int64 NumBytesRead() const;
 | 
| -  virtual base::TimeDelta GetConnectTimeMicros() const;
 | 
|  
 | 
|    // MockClientSocket:
 | 
|    virtual void OnReadComplete(const MockRead& data);
 | 
| @@ -729,8 +724,6 @@
 | 
|    virtual bool IsConnected() const;
 | 
|    virtual bool WasEverUsed() const;
 | 
|    virtual bool UsingTCPFastOpen() const;
 | 
| -  virtual int64 NumBytesRead() const;
 | 
| -  virtual base::TimeDelta GetConnectTimeMicros() const;
 | 
|  
 | 
|    // SSLClientSocket methods:
 | 
|    virtual void GetSSLInfo(net::SSLInfo* ssl_info);
 | 
| 
 | 
| Property changes on: net/socket/socket_test_util.h
 | 
| ___________________________________________________________________
 | 
| Added: svn:mergeinfo
 | 
| 
 | 
| 
 |