SPDY - persist SPDY settings.

net/spdy/spdy_session_spdy2_unittest.cc

 // Copyright (c) 2012 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.
 
 #include "net/spdy/spdy_session.h"
 
 #include "net/base/host_cache.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_log_unittest.h"
 #include "net/spdy/spdy_io_buffer.h"
@@ skipping 520 matching lines @@
   scoped_refptr<HttpNetworkSession> http_session(
       SpdySessionDependencies::SpdyCreateSession(&session_deps));
 
   const std::string kTestHost("www.foo.com");
   const int kTestPort = 80;
   HostPortPair test_host_port_pair(kTestHost, kTestPort);
   HostPortProxyPair pair(test_host_port_pair, ProxyServer::Direct());
 
   // Initialize the SpdySettingsStorage with 1 max concurrent streams.
   SpdySessionPool* spdy_session_pool(http_session->spdy_session_pool());
-  spdy::SpdySettings old_settings;
-  spdy::SettingsFlagsAndId id1(spdy::SETTINGS_FLAG_PLEASE_PERSIST, id.id());
-  old_settings.push_back(spdy::SpdySetting(id1, 1));
-  spdy_session_pool->http_server_properties()->SetSpdySettings(
-      test_host_port_pair, old_settings);
+  spdy::SettingsFlagsAndValue flags_and_value1(
+      spdy::SETTINGS_FLAG_PLEASE_PERSIST, 1);
+  spdy_session_pool->http_server_properties()->SetSpdySetting(
+      test_host_port_pair, id.id(), flags_and_value1);
 
   // Create a session.
   EXPECT_FALSE(spdy_session_pool->HasSession(pair));
   scoped_refptr<SpdySession> session =
       spdy_session_pool->Get(pair, BoundNetLog());
   ASSERT_TRUE(spdy_session_pool->HasSession(pair));
 
   scoped_refptr<TransportSocketParams> transport_params(
       new TransportSocketParams(test_host_port_pair,
                                 MEDIUM,
@@ skipping 58 matching lines @@
   scoped_refptr<HttpNetworkSession> http_session(
       SpdySessionDependencies::SpdyCreateSession(&session_deps));
 
   const std::string kTestHost("www.foo.com");
   const int kTestPort = 80;
   HostPortPair test_host_port_pair(kTestHost, kTestPort);
   HostPortProxyPair pair(test_host_port_pair, ProxyServer::Direct());
 
   // Initialize the SpdySettingsStorage with 1 max concurrent streams.
   SpdySessionPool* spdy_session_pool(http_session->spdy_session_pool());
-  spdy::SpdySettings settings;
-  spdy::SettingsFlagsAndId id(spdy::SETTINGS_FLAG_PLEASE_PERSIST,
-                              spdy::SETTINGS_MAX_CONCURRENT_STREAMS);
-  settings.push_back(spdy::SpdySetting(id, 1));
-  spdy_session_pool->http_server_properties()->SetSpdySettings(
-      test_host_port_pair, settings);
+  spdy::SettingsFlagsAndValue flags_and_value1(
+      spdy::SETTINGS_FLAG_PLEASE_PERSIST, 1);
+  spdy_session_pool->http_server_properties()->SetSpdySetting(
+      test_host_port_pair,
+      spdy::SETTINGS_MAX_CONCURRENT_STREAMS,
+      flags_and_value1);
 
   // Create a session.
   EXPECT_FALSE(spdy_session_pool->HasSession(pair));
   scoped_refptr<SpdySession> session =
       spdy_session_pool->Get(pair, BoundNetLog());
   ASSERT_TRUE(spdy_session_pool->HasSession(pair));
 
   scoped_refptr<TransportSocketParams> transport_params(
       new TransportSocketParams(test_host_port_pair,
                                 MEDIUM,
@@ skipping 73 matching lines @@
   session_deps.socket_factory->AddSSLSocketDataProvider(&ssl);
 
   scoped_refptr<HttpNetworkSession> http_session(
       SpdySessionDependencies::SpdyCreateSession(&session_deps));
 
   const std::string kTestHost("www.foo.com");
   const int kTestPort = 80;
   HostPortPair test_host_port_pair(kTestHost, kTestPort);
   HostPortProxyPair pair(test_host_port_pair, ProxyServer::Direct());
 
-  spdy::SettingsFlagsAndId id1(spdy::SETTINGS_FLAG_PLEASE_PERSIST, id.id());
-  settings.clear();
-  settings.push_back(spdy::SpdySetting(id1, kBogusSettingValue));
+  spdy::SettingsFlagsAndValue flags_and_value1(
+      spdy::SETTINGS_FLAG_PLEASE_PERSIST, kBogusSettingValue);
   SpdySessionPool* spdy_session_pool(http_session->spdy_session_pool());
-  spdy_session_pool->http_server_properties()->SetSpdySettings(
-      test_host_port_pair, settings);
+  spdy_session_pool->http_server_properties()->SetSpdySetting(
+      test_host_port_pair, id.id(), flags_and_value1);
+
   EXPECT_FALSE(spdy_session_pool->HasSession(pair));
   scoped_refptr<SpdySession> session =
       spdy_session_pool->Get(pair, BoundNetLog());
   EXPECT_TRUE(spdy_session_pool->HasSession(pair));
 
   scoped_refptr<TransportSocketParams> transport_params(
       new TransportSocketParams(test_host_port_pair,
                                 MEDIUM,
                                 false,
                                 false));
@@ skipping 176 matching lines @@
   const int kTestPort = 80;
   HostPortPair test_host_port_pair(kTestHost, kTestPort);
 
   SpdySessionDependencies session_deps;
   scoped_refptr<HttpNetworkSession> http_session(
       SpdySessionDependencies::SpdyCreateSession(&session_deps));
   SpdySessionPool* spdy_session_pool(http_session->spdy_session_pool());
 
   HttpServerProperties* test_http_server_properties =
       spdy_session_pool->http_server_properties();
-  spdy::SettingsFlagsAndId id(spdy::SETTINGS_FLAG_PLEASE_PERSIST,
-                              spdy::SETTINGS_MAX_CONCURRENT_STREAMS);
-  const size_t max_concurrent_streams = 2;
-  spdy::SpdySettings test_settings;
-  test_settings.push_back(spdy::SpdySetting(id, max_concurrent_streams));
-
-  test_http_server_properties->SetSpdySettings(test_host_port_pair,
-                                               test_settings);
+  spdy::SettingsFlagsAndValue flags_and_value1(
+      spdy::SETTINGS_FLAG_PLEASE_PERSIST, 2);
+  test_http_server_properties->SetSpdySetting(
+      test_host_port_pair,
+      spdy::SETTINGS_MAX_CONCURRENT_STREAMS,
+      flags_and_value1);
   EXPECT_NE(0u, test_http_server_properties->GetSpdySettings(
       test_host_port_pair).size());
   spdy_session_pool->OnIPAddressChanged();
   EXPECT_EQ(0u, test_http_server_properties->GetSpdySettings(
       test_host_port_pair).size());
 }
 
 TEST_F(SpdySessionSpdy2Test, NeedsCredentials) {
   SpdySessionDependencies session_deps;
 
@@ skipping 267 matching lines @@
 
   // But now if we drop our reference to the session, it will be destructed
   // and the transport socket will return to the pool, unblocking this
   // request.
   session2 = NULL;
   EXPECT_EQ(OK, callback6.WaitForResult());
   EXPECT_FALSE(pool.IsStalled());
 }
 
 }  // namespace net