reverting the change 19354, 19356

TEST=none
BUG=none

TBR=eroman

Review URL: http://codereview.chromium.org/149076

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19357 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 9 deletions

diff --git a/net/socket/socks_client_socket.h b/net/socket/socks_client_socket.h
index 53df119..03925ba 100644
--- a/net/socket/socks_client_socket.h
+++ b/net/socket/socks_client_socket.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NET_SOCKET_SOCKS_CLIENT_SOCKET_H_
-#define NET_SOCKET_SOCKS_CLIENT_SOCKET_H_
+#ifndef NET_BASE_SOCKS_CLIENT_SOCKET_H_
+#define NET_BASE_SOCKS_CLIENT_SOCKET_H_
 
 #include <string>
 
@@ -54,10 +54,6 @@ class SOCKSClientSocket : public ClientSocket {
 #endif
 
  private:
-  FRIEND_TEST(SOCKSClientSocketTest, CompleteHandshake);
-  FRIEND_TEST(SOCKSClientSocketTest, SOCKS4AFailedDNS);
-  FRIEND_TEST(SOCKSClientSocketTest, SOCKS4AIfDomainInIPv6);
-
   enum State {
     STATE_RESOLVE_HOST,
     STATE_RESOLVE_HOST_COMPLETE,
@@ -89,7 +85,7 @@ class SOCKSClientSocket : public ClientSocket {
   int DoHandshakeWrite();
   int DoHandshakeWriteComplete(int result);
 
-  const std::string BuildHandshakeWriteBuffer() const;
+  void BuildHandshakeWriteBuffer();
 
   CompletionCallbackImpl<SOCKSClientSocket> io_callback_;
 
@@ -106,10 +102,12 @@ class SOCKSClientSocket : public ClientSocket {
   // SOCKS handshake data. The length contains the expected size to
   // read or write.
   scoped_refptr<IOBuffer> handshake_buf_;
+  int handshake_buf_len_;
 
   // While writing, this buffer stores the complete write handshake data.
   // While reading, it stores the handshake information received so far.
-  std::string buffer_;
+  scoped_array<char> buffer_;
+  int buffer_len_;
 
   // This becomes true when the SOCKS handshake has completed and the
   // overlying connection is free to communicate.
@@ -129,5 +127,5 @@ class SOCKSClientSocket : public ClientSocket {
 
 }  // namespace net
 
-#endif  // NET_SOCKET_SOCKS_CLIENT_SOCKET_H_
+#endif  // NET_BASE_SOCKS_CLIENT_SOCKET_H_