SPDY - persist SPDY settings.

chrome/browser/net/http_server_properties_manager_unittest.cc

Index: chrome/browser/net/http_server_properties_manager_unittest.cc
===================================================================
--- chrome/browser/net/http_server_properties_manager_unittest.cc	(revision 127896)
+++ chrome/browser/net/http_server_properties_manager_unittest.cc	(working copy)
@@ -238,51 +238,29 @@
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
 }
 
-TEST_F(HttpServerPropertiesManagerTest, SetSpdySettings) {
-  ExpectPrefsUpdate();
-
-  // Add SpdySettings for mail.google.com:443.
-  net::HostPortPair spdy_server_mail("mail.google.com", 443);
-  spdy::SpdySettings spdy_settings;
-  spdy::SettingsFlagsAndId id1(spdy::SETTINGS_FLAG_PLEASE_PERSIST, 1234);
-  spdy_settings.push_back(std::make_pair(id1, 31337));
-  http_server_props_manager_->SetSpdySettings(spdy_server_mail, spdy_settings);
-
-  // Run the task.
-  loop_.RunAllPending();
-
-  spdy::SpdySettings spdy_settings_ret =
-      http_server_props_manager_->GetSpdySettings(spdy_server_mail);
-  ASSERT_EQ(1U, spdy_settings_ret.size());
-  spdy::SpdySetting spdy_setting1_ret = spdy_settings_ret.front();
-  spdy::SettingsFlagsAndId id1_ret(spdy_setting1_ret.first);
-  EXPECT_EQ(1234U, id1_ret.id());
-  EXPECT_EQ(spdy::SETTINGS_FLAG_PERSISTED, id1_ret.flags());
-  EXPECT_EQ(31337U, spdy_setting1_ret.second);
-
-  Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
-}
-
 TEST_F(HttpServerPropertiesManagerTest, SetSpdySetting) {
   ExpectPrefsUpdate();
 
   // Add SpdySetting for mail.google.com:443.
   net::HostPortPair spdy_server_mail("mail.google.com", 443);
-  spdy::SettingsFlagsAndId id1(spdy::SETTINGS_FLAG_PLEASE_PERSIST, 1234);
+  const uint32 id1 = 1234;
+  const uint8 flags1 = spdy::SETTINGS_FLAG_PLEASE_PERSIST;
+  const uint32 value1 = 31337;
+  spdy::SettingsFlagsAndValue flags_and_value1(flags1, value1);
   http_server_props_manager_->SetSpdySetting(
-      spdy_server_mail, std::make_pair(id1, 31337));
+      spdy_server_mail, id1, flags_and_value1);
 
   // Run the task.
   loop_.RunAllPending();
 
-  spdy::SpdySettings spdy_settings_ret =
+  const spdy::SettingsMap& settings_map1_ret =
       http_server_props_manager_->GetSpdySettings(spdy_server_mail);
-  ASSERT_EQ(1U, spdy_settings_ret.size());
-  spdy::SpdySetting spdy_setting1_ret = spdy_settings_ret.front();
-  spdy::SettingsFlagsAndId id1_ret(spdy_setting1_ret.first);
-  EXPECT_EQ(1234U, id1_ret.id());
-  EXPECT_EQ(spdy::SETTINGS_FLAG_PERSISTED, id1_ret.flags());
-  EXPECT_EQ(31337U, spdy_setting1_ret.second);
+  ASSERT_EQ(1U, settings_map1_ret.size());
+  spdy::SettingsMap::const_iterator it1_ret = settings_map1_ret.find(id1);
+  EXPECT_NE(it1_ret, settings_map1_ret.end());
+  spdy::SettingsFlagsAndValue flags_and_value1_ret = it1_ret->second;
+  EXPECT_EQ(spdy::SETTINGS_FLAG_PERSISTED, flags_and_value1_ret.first);
+  EXPECT_EQ(value1, flags_and_value1_ret.second);
 
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
 }
@@ -343,10 +321,12 @@
   http_server_props_manager_->SetAlternateProtocol(
       spdy_server_mail, 443, net::NPN_SPDY_2);
 
-  spdy::SpdySettings spdy_settings;
-  spdy::SettingsFlagsAndId id1(spdy::SETTINGS_FLAG_PLEASE_PERSIST, 1234);
-  spdy_settings.push_back(std::make_pair(id1, 31337));
-  http_server_props_manager_->SetSpdySettings(spdy_server_mail, spdy_settings);
+  const uint32 id1 = 1234;
+  const uint8 flags1 = spdy::SETTINGS_FLAG_PLEASE_PERSIST;
+  const uint32 value1 = 31337;
+  spdy::SettingsFlagsAndValue flags_and_value1(flags1, value1);
+  http_server_props_manager_->SetSpdySetting(
+      spdy_server_mail, id1, flags_and_value1);
 
   net::HostPortPair known_pipeliner("pipeline.com", 8080);
   http_server_props_manager_->SetPipelineCapability(known_pipeliner,
@@ -359,14 +339,15 @@
   EXPECT_TRUE(
       http_server_props_manager_->HasAlternateProtocol(spdy_server_mail));
 
-  spdy::SpdySettings spdy_settings_ret =
+  // Check SPDY settings values.
+  const spdy::SettingsMap& settings_map1_ret =
       http_server_props_manager_->GetSpdySettings(spdy_server_mail);
-  ASSERT_EQ(1U, spdy_settings_ret.size());
-  spdy::SpdySetting spdy_setting1_ret = spdy_settings_ret.front();
-  spdy::SettingsFlagsAndId id1_ret(spdy_setting1_ret.first);
-  EXPECT_EQ(1234U, id1_ret.id());
-  EXPECT_EQ(spdy::SETTINGS_FLAG_PERSISTED, id1_ret.flags());
-  EXPECT_EQ(31337U, spdy_setting1_ret.second);
+  ASSERT_EQ(1U, settings_map1_ret.size());
+  spdy::SettingsMap::const_iterator it1_ret = settings_map1_ret.find(id1);
+  EXPECT_NE(it1_ret, settings_map1_ret.end());
+  spdy::SettingsFlagsAndValue flags_and_value1_ret = it1_ret->second;
+  EXPECT_EQ(spdy::SETTINGS_FLAG_PERSISTED, flags_and_value1_ret.first);
+  EXPECT_EQ(value1, flags_and_value1_ret.second);
 
   EXPECT_EQ(net::PIPELINE_CAPABLE,
             http_server_props_manager_->GetPipelineCapability(known_pipeliner));
@@ -384,9 +365,9 @@
   EXPECT_FALSE(
       http_server_props_manager_->HasAlternateProtocol(spdy_server_mail));
 
-  spdy::SpdySettings spdy_settings1_ret =
+  const spdy::SettingsMap& settings_map2_ret =
       http_server_props_manager_->GetSpdySettings(spdy_server_mail);
-  EXPECT_EQ(0U, spdy_settings1_ret.size());
+  EXPECT_EQ(0U, settings_map2_ret.size());
 
   EXPECT_EQ(net::PIPELINE_UNKNOWN,
             http_server_props_manager_->GetPipelineCapability(known_pipeliner));