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

net/socket/socks_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/socks_client_socket.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "net/base/io_buffer.h"
@@ skipping 162 matching lines @@
 }
 
 base::TimeDelta SOCKSClientSocket::GetConnectTimeMicros() const {
   if (transport_.get() && transport_->socket()) {
     return transport_->socket()->GetConnectTimeMicros();
   }
   NOTREACHED();
   return base::TimeDelta::FromMicroseconds(-1);
 }
 
+NextProto SOCKSClientSocket::GetNegotiatedProtocol() const {
+  return kProtoUnknown;

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

I wonder if we should call transport_->socket()->GetNegotiatedProtocol()
here.

I guess we can wait until it is known to be necessary.

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

Done.
Nah, I think we might as well do it now.  Delegating to the transport socket is
correct.  (It's always on top of a TCP socket which returns kProtoUnknown)  

+}
+
 // Read is called by the transport layer above to read. This can only be done
 // if the SOCKS handshake is complete.
 int SOCKSClientSocket::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 233 matching lines @@
 
 int SOCKSClientSocket::GetPeerAddress(AddressList* address) const {
   return transport_->socket()->GetPeerAddress(address);
 }
 
 int SOCKSClientSocket::GetLocalAddress(IPEndPoint* address) const {
   return transport_->socket()->GetLocalAddress(address);
 }
 
 }  // namespace net