Remove unused variable and method SpdySession::use_ssl_

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

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

14 files changed, 0 insertions, 30 deletions

diff --git a/net/http/http_network_layer.cc b/net/http/http_network_layer.cc
index 39d24f4..57dff62 100644
--- a/net/http/http_network_layer.cc
+++ b/net/http/http_network_layer.cc
@@ -85,7 +85,6 @@ void HttpNetworkLayer::EnableSpdy(const std::string& mode) {
       HttpStreamFactory::set_spdy_enabled(false);
     } else if (option == kDisableSSL) {
       SpdySession::set_default_protocol(SSLClientSocket::kProtoSPDY2);
-      SpdySession::SetSSLMode(false);  // Disable SSL
       HttpStreamFactory::set_force_spdy_over_ssl(false);
       HttpStreamFactory::set_force_spdy_always(true);
     } else if (option == kSSL) {
diff --git a/net/http/http_network_transaction_spdy21_unittest.cc b/net/http/http_network_transaction_spdy21_unittest.cc
index a4c8834..0365185 100644
--- a/net/http/http_network_transaction_spdy21_unittest.cc
+++ b/net/http/http_network_transaction_spdy21_unittest.cc
@@ -7362,8 +7362,6 @@ TEST_F(HttpNetworkTransactionSpdy21Test,
   SSLSocketDataProvider ssl(ASYNC, OK);
   ssl.SetNextProto(SSLClientSocket::kProtoSPDY21);
   session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
-  // Make sure we use ssl for spdy here.
-  SpdySession::SetSSLMode(true);
 
   scoped_ptr<spdy::SpdyFrame> req(ConstructSpdyGet(NULL, 0, false, 1, LOWEST));
   MockWrite spdy_writes[] = { CreateMockWrite(*req) };
diff --git a/net/http/http_network_transaction_spdy2_unittest.cc b/net/http/http_network_transaction_spdy2_unittest.cc
index 4d19b32..78e76b3 100644
--- a/net/http/http_network_transaction_spdy2_unittest.cc
+++ b/net/http/http_network_transaction_spdy2_unittest.cc
@@ -7361,8 +7361,6 @@ TEST_F(HttpNetworkTransactionSpdy2Test,
   SSLSocketDataProvider ssl(ASYNC, OK);
   ssl.SetNextProto(SSLClientSocket::kProtoSPDY2);
   session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
-  // Make sure we use ssl for spdy here.
-  SpdySession::SetSSLMode(true);
 
   scoped_ptr<spdy::SpdyFrame> req(ConstructSpdyGet(NULL, 0, false, 1, LOWEST));
   MockWrite spdy_writes[] = { CreateMockWrite(*req) };
diff --git a/net/http/http_network_transaction_spdy3_unittest.cc b/net/http/http_network_transaction_spdy3_unittest.cc
index 59b45ea..2bec72a 100644
--- a/net/http/http_network_transaction_spdy3_unittest.cc
+++ b/net/http/http_network_transaction_spdy3_unittest.cc
@@ -7360,8 +7360,6 @@ TEST_F(HttpNetworkTransactionSpdy3Test,
   SSLSocketDataProvider ssl(ASYNC, OK);
   ssl.SetNextProto(SSLClientSocket::kProtoSPDY3);
   session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
-  // Make sure we use ssl for spdy here.
-  SpdySession::SetSSLMode(true);
 
   scoped_ptr<spdy::SpdyFrame> req(ConstructSpdyGet(NULL, 0, false, 1, LOWEST));
   MockWrite spdy_writes[] = { CreateMockWrite(*req) };
diff --git a/net/spdy/spdy_http_stream_spdy2_unittest.cc b/net/spdy/spdy_http_stream_spdy2_unittest.cc
index 836d50dc..15255c8 100644
--- a/net/spdy/spdy_http_stream_spdy2_unittest.cc
+++ b/net/spdy/spdy_http_stream_spdy2_unittest.cc
@@ -77,7 +77,6 @@ class SpdyHttpStreamSpdy2Test : public testing::Test {
 
 TEST_F(SpdyHttpStreamSpdy2Test, SendRequest) {
   EnableCompression(false);
-  SpdySession::SetSSLMode(false);
 
   scoped_ptr<spdy::SpdyFrame> req(ConstructSpdyGet(NULL, 0, false, 1, LOWEST));
   MockWrite writes[] = {
@@ -126,7 +125,6 @@ TEST_F(SpdyHttpStreamSpdy2Test, SendRequest) {
 
 TEST_F(SpdyHttpStreamSpdy2Test, SendChunkedPost) {
   EnableCompression(false);
-  SpdySession::SetSSLMode(false);
   UploadDataStream::set_merge_chunks(false);
 
   scoped_ptr<spdy::SpdyFrame> req(ConstructChunkedSpdyPost(NULL, 0));
@@ -190,7 +188,6 @@ TEST_F(SpdyHttpStreamSpdy2Test, SendChunkedPost) {
 // Test case for bug: http://code.google.com/p/chromium/issues/detail?id=50058
 TEST_F(SpdyHttpStreamSpdy2Test, SpdyURLTest) {
   EnableCompression(false);
-  SpdySession::SetSSLMode(false);
 
   const char * const full_url = "http://www.google.com/foo?query=what#anchor";
   const char * const base_url = "http://www.google.com/foo?query=what";
diff --git a/net/spdy/spdy_http_stream_spdy3_unittest.cc b/net/spdy/spdy_http_stream_spdy3_unittest.cc
index 6f3f825..8df1b24 100644
--- a/net/spdy/spdy_http_stream_spdy3_unittest.cc
+++ b/net/spdy/spdy_http_stream_spdy3_unittest.cc
@@ -77,7 +77,6 @@ class SpdyHttpStreamSpdy3Test : public testing::Test {
 
 TEST_F(SpdyHttpStreamSpdy3Test, SendRequest) {
   EnableCompression(false);
-  SpdySession::SetSSLMode(false);
 
   scoped_ptr<spdy::SpdyFrame> req(ConstructSpdyGet(NULL, 0, false, 1, LOWEST));
   MockWrite writes[] = {
@@ -126,7 +125,6 @@ TEST_F(SpdyHttpStreamSpdy3Test, SendRequest) {
 
 TEST_F(SpdyHttpStreamSpdy3Test, SendChunkedPost) {
   EnableCompression(false);
-  SpdySession::SetSSLMode(false);
   UploadDataStream::set_merge_chunks(false);
 
   scoped_ptr<spdy::SpdyFrame> req(ConstructChunkedSpdyPost(NULL, 0));
@@ -190,7 +188,6 @@ TEST_F(SpdyHttpStreamSpdy3Test, SendChunkedPost) {
 // Test case for bug: http://code.google.com/p/chromium/issues/detail?id=50058
 TEST_F(SpdyHttpStreamSpdy3Test, SpdyURLTest) {
   EnableCompression(false);
-  SpdySession::SetSSLMode(false);
 
   const char * const full_url = "http://www.google.com/foo?query=what#anchor";
   const char * const base_url = "http://www.google.com/foo?query=what";
diff --git a/net/spdy/spdy_proxy_client_socket_spdy2_unittest.cc b/net/spdy/spdy_proxy_client_socket_spdy2_unittest.cc
index 5963e96..4b9fe03 100644
--- a/net/spdy/spdy_proxy_client_socket_spdy2_unittest.cc
+++ b/net/spdy/spdy_proxy_client_socket_spdy2_unittest.cc
@@ -179,7 +179,6 @@ void SpdyProxyClientSocketSpdy2Test::Initialize(MockRead* reads,
 
   session_ = SpdySessionDependencies::SpdyCreateSessionDeterministic(
       &session_deps_);
-  SpdySession::SetSSLMode(false);
   spdy::SpdyFramer::set_enable_compression_default(false);
 
   // Creates a new spdy session
diff --git a/net/spdy/spdy_proxy_client_socket_spdy3_unittest.cc b/net/spdy/spdy_proxy_client_socket_spdy3_unittest.cc
index 966daf3..0e32eb2 100644
--- a/net/spdy/spdy_proxy_client_socket_spdy3_unittest.cc
+++ b/net/spdy/spdy_proxy_client_socket_spdy3_unittest.cc
@@ -179,7 +179,6 @@ void SpdyProxyClientSocketSpdy3Test::Initialize(MockRead* reads,
 
   session_ = SpdySessionDependencies::SpdyCreateSessionDeterministic(
       &session_deps_);
-  SpdySession::SetSSLMode(false);
   spdy::SpdyFramer::set_enable_compression_default(false);
 
   // Creates a new spdy session
diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc
index cc190ec..299ede0 100644
--- a/net/spdy/spdy_session.cc
+++ b/net/spdy/spdy_session.cc
@@ -265,8 +265,6 @@ class NetLogSpdyGoAwayParameter : public NetLog::EventParameters {
 }  // namespace
 
 // static
-bool SpdySession::use_ssl_ = true;
-
 SSLClientSocket::NextProto SpdySession::default_protocol_ =
     SSLClientSocket::kProtoUnknown;
 
diff --git a/net/spdy/spdy_session.h b/net/spdy/spdy_session.h
index 50447c0..1c041a1 100644
--- a/net/spdy/spdy_session.h
+++ b/net/spdy/spdy_session.h
@@ -167,10 +167,6 @@ class NET_EXPORT SpdySession : public base::RefCounted<SpdySession>,
   // Reset all static settings to initialized values. Used to init test suite.
   static void ResetStaticSettingsToInit();
 
-  // Enable or disable SSL.
-  static void SetSSLMode(bool enable) { use_ssl_ = enable; }
-  static bool SSLMode() { return use_ssl_; }
-
   // Specify the SPDY protocol to be used for SPDY session which do not use NPN
   // to negotiate a particular protocol.
   static void set_default_protocol(
@@ -631,7 +627,6 @@ class NET_EXPORT SpdySession : public base::RefCounted<SpdySession>,
 
   SpdyCredentialState credential_state_;
 
-  static bool use_ssl_;
   static SSLClientSocket::NextProto default_protocol_;
   static size_t init_max_concurrent_streams_;
   static size_t max_concurrent_stream_limit_;
diff --git a/net/spdy/spdy_stream_spdy2_unittest.cc b/net/spdy/spdy_stream_spdy2_unittest.cc
index 36182a6..d84dc0b 100644
--- a/net/spdy/spdy_stream_spdy2_unittest.cc
+++ b/net/spdy/spdy_stream_spdy2_unittest.cc
@@ -185,7 +185,6 @@ TEST_F(SpdyStreamSpdy2Test, SendDataAfterOpen) {
   data->set_connect_data(connect_data);
 
   session_deps.socket_factory->AddSocketDataProvider(data.get());
-  SpdySession::SetSSLMode(false);
 
   scoped_refptr<SpdySession> session(CreateSpdySession());
   const char* kStreamUrl = "http://www.google.com/";
@@ -257,7 +256,6 @@ TEST_F(SpdyStreamSpdy2Test, PushedStream) {
   data->set_connect_data(connect_data);
 
   session_deps.socket_factory->AddSocketDataProvider(data.get());
-  SpdySession::SetSSLMode(false);
 
   HostPortPair host_port_pair("www.google.com", 80);
   scoped_refptr<TransportSocketParams> transport_params(
@@ -358,7 +356,6 @@ TEST_F(SpdyStreamSpdy2Test, StreamError) {
   data->set_connect_data(connect_data);
 
   session_deps.socket_factory->AddSocketDataProvider(data.get());
-  SpdySession::SetSSLMode(false);
 
   scoped_refptr<SpdySession> session(CreateSpdySession());
   const char* kStreamUrl = "http://www.google.com/";
diff --git a/net/spdy/spdy_stream_spdy3_unittest.cc b/net/spdy/spdy_stream_spdy3_unittest.cc
index 9672d15..988dd62 100644
--- a/net/spdy/spdy_stream_spdy3_unittest.cc
+++ b/net/spdy/spdy_stream_spdy3_unittest.cc
@@ -185,7 +185,6 @@ TEST_F(SpdyStreamSpdy3Test, SendDataAfterOpen) {
   data->set_connect_data(connect_data);
 
   session_deps.socket_factory->AddSocketDataProvider(data.get());
-  SpdySession::SetSSLMode(false);
 
   scoped_refptr<SpdySession> session(CreateSpdySession());
   const char* kStreamUrl = "http://www.google.com/";
@@ -257,7 +256,6 @@ TEST_F(SpdyStreamSpdy3Test, PushedStream) {
   data->set_connect_data(connect_data);
 
   session_deps.socket_factory->AddSocketDataProvider(data.get());
-  SpdySession::SetSSLMode(false);
 
   HostPortPair host_port_pair("www.google.com", 80);
   scoped_refptr<TransportSocketParams> transport_params(
@@ -361,7 +359,6 @@ TEST_F(SpdyStreamSpdy3Test, StreamError) {
   data->set_connect_data(connect_data);
 
   session_deps.socket_factory->AddSocketDataProvider(data.get());
-  SpdySession::SetSSLMode(false);
 
   scoped_refptr<SpdySession> session(CreateSpdySession());
   const char* kStreamUrl = "http://www.google.com/";
diff --git a/net/spdy/spdy_websocket_stream_spdy2_unittest.cc b/net/spdy/spdy_websocket_stream_spdy2_unittest.cc
index 311e300..b5e4ae2 100644
--- a/net/spdy/spdy_websocket_stream_spdy2_unittest.cc
+++ b/net/spdy/spdy_websocket_stream_spdy2_unittest.cc
@@ -191,7 +191,6 @@ class SpdyWebSocketStreamSpdy2Test : public testing::Test {
   virtual void SetUp() {
     EnableCompression(false);
     SpdySession::set_default_protocol(SSLClientSocket::kProtoSPDY2);
-    SpdySession::SetSSLMode(false);
 
     host_port_pair_.set_host("example.com");
     host_port_pair_.set_port(80);
diff --git a/net/spdy/spdy_websocket_stream_spdy3_unittest.cc b/net/spdy/spdy_websocket_stream_spdy3_unittest.cc
index b78b9f5..5282d01 100644
--- a/net/spdy/spdy_websocket_stream_spdy3_unittest.cc
+++ b/net/spdy/spdy_websocket_stream_spdy3_unittest.cc
@@ -191,7 +191,6 @@ class SpdyWebSocketStreamSpdy3Test : public testing::Test {
   virtual void SetUp() {
     EnableCompression(false);
     SpdySession::set_default_protocol(SSLClientSocket::kProtoSPDY3);
-    SpdySession::SetSSLMode(false);
 
     host_port_pair_.set_host("example.com");
     host_port_pair_.set_port(80);