Revert 91997 - Add WebSocket over SPDY experimental implementation.

- Realize WebSocketJob's internal protocol switch to SPDY using SpdyWebSocketStream
- Add simple test to verify connection over SPDY

BUG=42320
TEST=net_unittests --gtest_filter=WebSocketJobTest\*

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

TBR=toyoshim@chromium.org
Review URL: http://codereview.chromium.org/7333006

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

1 files changed, 1 insertions, 16 deletions

diff --git a/net/websockets/websocket_job.h b/net/websockets/websocket_job.h
index f0e67c6..369ef56 100644
--- a/net/websockets/websocket_job.h
+++ b/net/websockets/websocket_job.h
@@ -13,7 +13,6 @@
 #include "net/base/address_list.h"
 #include "net/base/completion_callback.h"
 #include "net/socket_stream/socket_stream_job.h"
-#include "net/spdy/spdy_websocket_stream.h"
 
 class GURL;
 
@@ -32,8 +31,7 @@ class WebSocketHandshakeResponseHandler;
 // TODO(ukai): refactor websocket.cc to use this.
 class NET_API WebSocketJob
     : public SocketStreamJob,
-      public SocketStream::Delegate,
-      public SpdyWebSocketStream::Delegate {
+      public SocketStream::Delegate {
  public:
   // This is state of WebSocket, not SocketStream.
   enum State {
@@ -72,15 +70,6 @@ class NET_API WebSocketJob
       SocketStream* socket, AuthChallengeInfo* auth_info);
   virtual void OnError(const SocketStream* socket, int error);
 
-  // SpdyWebSocketStream::Delegate methods.
-  virtual void OnCreatedSpdyStream(int status);
-  virtual void OnSentSpdyHeaders(int status);
-  virtual int OnReceivedSpdyResponseHeader(
-      const spdy::SpdyHeaderBlock& headers, int status);
-  virtual void OnSentSpdyData(int amount_sent);
-  virtual void OnReceivedSpdyData(const char* data, int length);
-  virtual void OnCloseSpdyStream();
-
  private:
   friend class WebSocketThrottle;
   friend class WebSocketJobTest;
@@ -103,7 +92,6 @@ class NET_API WebSocketJob
   bool IsWaiting() const;
   void Wakeup();
   void RetryPendingIO();
-  void CompleteIO(int result);
 
   bool SendDataInternal(const char* data, int length);
   void CloseInternal();
@@ -130,9 +118,6 @@ class NET_API WebSocketJob
   scoped_refptr<DrainableIOBuffer> current_buffer_;
   scoped_ptr<WebSocketFrameHandler> receive_frame_handler_;
 
-  scoped_ptr<SpdyWebSocketStream> spdy_websocket_stream_;
-  std::string challenge_;
-
   DISALLOW_COPY_AND_ASSIGN(WebSocketJob);
 };