Revert 60747 - Add a new class SpdyProxyClientSocket which implements ClientSocket

by sending a CONNECT request via a SPDY SYN_STREAM frame to a SPDY proxy,
and then reading/writing data to/from SPDY Data frames.

BUG=29625
TEST=none

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

TBR=rch@chromium.org
Review URL: http://codereview.chromium.org/3391029

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

1 files changed, 4 insertions, 6 deletions

diff --git a/net/spdy/spdy_framer.h b/net/spdy/spdy_framer.h
index 00ddac0..e6d0e15 100644
--- a/net/spdy/spdy_framer.h
+++ b/net/spdy/spdy_framer.h
@@ -26,11 +26,10 @@ typedef struct z_stream_s z_stream;  // Forward declaration for zlib.
 namespace net {
 class HttpNetworkLayer;
 class HttpNetworkTransactionTest;
-class SpdyHttpStreamTest;
 class SpdyNetworkTransactionTest;
-class SpdyProxyClientSocketTest;
 class SpdySessionTest;
 class SpdyStreamTest;
+class SpdyHttpStreamTest;
 }
 
 namespace spdy {
@@ -249,12 +248,11 @@ class SpdyFramer {
  protected:
   FRIEND_TEST_ALL_PREFIXES(SpdyFramerTest, DataCompression);
   FRIEND_TEST_ALL_PREFIXES(SpdyFramerTest, UnclosedStreamDataCompressors);
-  friend class net::HttpNetworkLayer;  // This is temporary for the server.
-  friend class net::HttpNetworkTransactionTest;
-  friend class net::SpdyHttpStreamTest;
   friend class net::SpdyNetworkTransactionTest;
-  friend class net::SpdyProxyClientSocketTest;
+  friend class net::HttpNetworkTransactionTest;
+  friend class net::HttpNetworkLayer;  // This is temporary for the server.
   friend class net::SpdySessionTest;
+  friend class net::SpdyHttpStreamTest;
   friend class net::SpdyStreamTest;
   friend class test::TestSpdyVisitor;
   friend void test::FramerSetEnableCompressionHelper(SpdyFramer* framer,