Revert 60747 - Add a new class SpdyProxyClientSocket which implements ClientS...

net/spdy/spdy_framer.h

 // Copyright (c) 2010 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_SPDY_SPDY_FRAMER_H_
 #define NET_SPDY_SPDY_FRAMER_H_
 #pragma once
 
 #ifdef _WIN32
 #include <winsock2.h>
 #else
 #include <arpa/inet.h>
 #endif
 #include <list>
 #include <map>
 #include <string>
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/scoped_ptr.h"
 #include "net/spdy/spdy_protocol.h"
 
 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 {
 
 class SpdyFramer;
 class SpdyFramerTest;
 
 namespace test {
 class TestSpdyVisitor;
 void FramerSetEnableCompressionHelper(SpdyFramer* framer, bool compress);
@@ skipping 198 matching lines @@
   static void set_protocol_version(int version) { spdy_version_= version; }
   static int protocol_version() { return spdy_version_; }
 
   // Export the compression dictionary
   static const char kDictionary[];
   static const int kDictionarySize;
 
  protected:
   FRIEND_TEST_ALL_PREFIXES(SpdyFramerTest, DataCompression);
   FRIEND_TEST_ALL_PREFIXES(SpdyFramerTest, UnclosedStreamDataCompressors);
+  friend class net::SpdyNetworkTransactionTest;
+  friend class net::HttpNetworkTransactionTest;
   friend class net::HttpNetworkLayer;  // This is temporary for the server.
-  friend class net::HttpNetworkTransactionTest;
+  friend class net::SpdySessionTest;
   friend class net::SpdyHttpStreamTest;
-  friend class net::SpdyNetworkTransactionTest;
-  friend class net::SpdyProxyClientSocketTest;
-  friend class net::SpdySessionTest;
   friend class net::SpdyStreamTest;
   friend class test::TestSpdyVisitor;
   friend void test::FramerSetEnableCompressionHelper(SpdyFramer* framer,
                                                      bool compress);
 
   // For ease of testing we can tweak compression on/off.
   void set_enable_compression(bool value);
   static void set_enable_compression_default(bool value);
 
  private:
@@ skipping 62 matching lines @@
 
   SpdyFramerVisitorInterface* visitor_;
 
   static bool compression_default_;
   static int spdy_version_;
 };
 
 }  // namespace spdy
 
 #endif  // NET_SPDY_SPDY_FRAMER_H_