Revert 93860 - secure proxy support in websocket

net/socket_stream/socket_stream.h

 // 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.
 
 #ifndef NET_SOCKET_STREAM_SOCKET_STREAM_H_
 #define NET_SOCKET_STREAM_SOCKET_STREAM_H_
 #pragma once
 
 #include <deque>
 #include <map>
@@ skipping 210 matching lines @@
     STATE_RESOLVE_PROTOCOL,
     STATE_RESOLVE_PROTOCOL_COMPLETE,
     STATE_TCP_CONNECT,
     STATE_TCP_CONNECT_COMPLETE,
     STATE_WRITE_TUNNEL_HEADERS,
     STATE_WRITE_TUNNEL_HEADERS_COMPLETE,
     STATE_READ_TUNNEL_HEADERS,
     STATE_READ_TUNNEL_HEADERS_COMPLETE,
     STATE_SOCKS_CONNECT,
     STATE_SOCKS_CONNECT_COMPLETE,
-    STATE_SECURE_PROXY_CONNECT,
-    STATE_SECURE_PROXY_CONNECT_COMPLETE,
     STATE_SSL_CONNECT,
     STATE_SSL_CONNECT_COMPLETE,
     STATE_READ_WRITE,
     STATE_AUTH_REQUIRED,
     STATE_CLOSE,
   };
 
   enum ProxyMode {
     kDirectConnection,  // If using a direct connection
     kTunnelProxy,  // If using a tunnel (CONNECT method as HTTPS)
     kSOCKSProxy,  // If using a SOCKS proxy
   };
 
   // Use the same number as HttpNetworkTransaction::kMaxHeaderBufSize.
   enum { kMaxTunnelResponseHeadersSize = 32768 };  // 32 kilobytes.
 
   // Copies the given addrinfo list in |addresses_|.
   // Used for WebSocketThrottleTest.
   void CopyAddrInfo(struct addrinfo* head);
 
   void DoClose();
 
   // Finishes the job.
   // Calls OnError and OnClose of delegate, and no more
   // notifications will be sent to delegate.
   void Finish(int result);
 
-  int DidEstablishSSL(int result);
   int DidEstablishConnection();
   int DidReceiveData(int result);
   int DidSendData(int result);
 
   void OnIOCompleted(int result);
   void OnReadCompleted(int result);
   void OnWriteCompleted(int result);
 
   void DoLoop(int result);
 
   int DoResolveProxy();
   int DoResolveProxyComplete(int result);
   int DoResolveHost();
   int DoResolveHostComplete(int result);
   int DoResolveProtocol(int result);
   int DoResolveProtocolComplete(int result);
   int DoTcpConnect(int result);
   int DoTcpConnectComplete(int result);
   int DoWriteTunnelHeaders();
   int DoWriteTunnelHeadersComplete(int result);
   int DoReadTunnelHeaders();
   int DoReadTunnelHeadersComplete(int result);
   int DoSOCKSConnect();
   int DoSOCKSConnectComplete(int result);
-  int DoSecureProxyConnect();
-  int DoSecureProxyConnectComplete(int result);
   int DoSSLConnect();
   int DoSSLConnectComplete(int result);
   int DoReadWrite(int result);
 
   GURL ProxyAuthOrigin() const;
   int HandleAuthChallenge(const HttpResponseHeaders* headers);
   void DoAuthRequired();
   void DoRestartWithAuth();
 
   int HandleCertificateError(int result);
@@ skipping 62 matching lines @@
   bool server_closed_;
 
   scoped_ptr<SocketStreamMetrics> metrics_;
 
   DISALLOW_COPY_AND_ASSIGN(SocketStream);
 };
 
 }  // namespace net
 
 #endif  // NET_SOCKET_STREAM_SOCKET_STREAM_H_