Add a new GetNegotiatedProtocol method to StreamSocket and implement in all subclasses.

net/socket/socks5_client_socket.cc

 // Copyright (c) 2011 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.
 
 #include "net/socket/socks5_client_socket.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/debug/trace_event.h"
 #include "base/format_macros.h"
@@ skipping 140 matching lines @@
 }
 
 base::TimeDelta SOCKS5ClientSocket::GetConnectTimeMicros() const {
   if (transport_.get() && transport_->socket()) {
     return transport_->socket()->GetConnectTimeMicros();
   }
   NOTREACHED();
   return base::TimeDelta::FromMicroseconds(-1);
 }
 
+NextProto SOCKS5ClientSocket::GetNegotiatedProtocol() const {
+  return kProtoUnknown;
+}
+

[wtc, 2012/03/30 21:19:14]

Nit: remove one blank line.

[Ryan Hamilton, 2012/03/30 21:53:17]

Done.

+
 // Read is called by the transport layer above to read. This can only be done
 // if the SOCKS handshake is complete.
 int SOCKS5ClientSocket::Read(IOBuffer* buf, int buf_len,
                              const CompletionCallback& callback) {
   DCHECK(completed_handshake_);
   DCHECK_EQ(STATE_NONE, next_state_);
   DCHECK(user_callback_.is_null());
 
   return transport_->socket()->Read(buf, buf_len, callback);
 }
@@ skipping 326 matching lines @@
 
 int SOCKS5ClientSocket::GetPeerAddress(AddressList* address) const {
   return transport_->socket()->GetPeerAddress(address);
 }
 
 int SOCKS5ClientSocket::GetLocalAddress(IPEndPoint* address) const {
   return transport_->socket()->GetLocalAddress(address);
 }
 
 }  // namespace net