Roll mojo SDK to 734c6e1652ff2f3b696e441722838f453f4f9b42

mojo/services/network/tcp_connected_socket_impl.h

Index: mojo/services/network/tcp_connected_socket_impl.h
diff --git a/mojo/services/network/tcp_connected_socket_impl.h b/mojo/services/network/tcp_connected_socket_impl.h
index 0fed4d0261c05f7234d10dd5422000a1e2197900..6b6460e8aa342bc9bbfb623f549c37dda7ce49bc 100644
--- a/mojo/services/network/tcp_connected_socket_impl.h
+++ b/mojo/services/network/tcp_connected_socket_impl.h
@@ -17,7 +17,7 @@ namespace mojo {
 class MojoToNetPendingBuffer;
 class NetToMojoPendingBuffer;
 
-class TCPConnectedSocketImpl : public TCPConnectedSocket, public ErrorHandler {
+class TCPConnectedSocketImpl : public TCPConnectedSocket {
  public:
   TCPConnectedSocketImpl(scoped_ptr<net::TCPSocket> socket,
                          ScopedDataPipeConsumerHandle send_stream,
@@ -26,9 +26,6 @@ class TCPConnectedSocketImpl : public TCPConnectedSocket, public ErrorHandler {
   ~TCPConnectedSocketImpl() override;
 
  private:
-    // ErrorHandler methods:
-    void OnConnectionError() override;
-
   // "Receiving" in this context means reading from TCPSocket and writing to
   // the Mojo receive_stream.
   void ReceiveMore();
@@ -48,6 +45,7 @@ class TCPConnectedSocketImpl : public TCPConnectedSocket, public ErrorHandler {
   void ListenForSendPeerClosed();
   void OnSendDataPipeClosed(MojoResult result);
 
+  void OnConnectionError();
   void DeleteIfNeeded();
 
   scoped_ptr<net::TCPSocket> socket_;