SPDY - integration of spdy/3 code.

chrome/browser/net/http_server_properties_manager_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 "chrome/browser/net/http_server_properties_manager.h"
 
 #include "base/basictypes.h"
 #include "base/message_loop.h"
 #include "base/values.h"
 #include "chrome/common/pref_names.h"
@@ skipping 263 matching lines @@
   EXPECT_TRUE(http_server_props_manager_->SupportsSpdy(spdy_server_mail));
   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(0);
-  id1.set_flags(spdy::SETTINGS_FLAG_PLEASE_PERSIST);
-  id1.set_id(1234);
+  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);
+  http_server_props_manager_->SetSpdySetting(
+      spdy_server_mail, std::make_pair(id1, 31337));
+
+  // 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, HasAlternateProtocol) {
   ExpectPrefsUpdate();
 
   net::HostPortPair spdy_server_mail("mail.google.com", 80);
   EXPECT_FALSE(
       http_server_props_manager_->HasAlternateProtocol(spdy_server_mail));
   http_server_props_manager_->SetAlternateProtocol(
       spdy_server_mail, 443, net::NPN_SPDY_2);
 
   // Run the task.
@@ skipping 37 matching lines @@
 
 TEST_F(HttpServerPropertiesManagerTest, Clear) {
   ExpectPrefsUpdate();
 
   net::HostPortPair spdy_server_mail("mail.google.com", 443);
   http_server_props_manager_->SetSupportsSpdy(spdy_server_mail, true);
   http_server_props_manager_->SetAlternateProtocol(
       spdy_server_mail, 443, net::NPN_SPDY_2);
 
   spdy::SpdySettings spdy_settings;
-  spdy::SettingsFlagsAndId id1(0);
-  id1.set_flags(spdy::SETTINGS_FLAG_PLEASE_PERSIST);
-  id1.set_id(1234);
+  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);
 
   net::HostPortPair known_pipeliner("pipeline.com", 8080);
   http_server_props_manager_->SetPipelineCapability(known_pipeliner,
                                                     net::PIPELINE_CAPABLE);
 
   // Run the task.
   loop_.RunAllPending();
 
@@ skipping 103 matching lines @@
   // Run the task after shutdown, but before deletion.
   loop_.RunAllPending();
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
   http_server_props_manager_.reset();
   loop_.RunAllPending();
 }
 
 }  // namespace
 
 }  // namespace chrome_browser_net