Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6051)

Unified Diff: chrome/browser/net/http_server_properties_manager_unittest.cc

Issue 9618002: SPDY - integration of spdy/3 code. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/net/http_server_properties_manager.cc ('k') | net/base/net_test_suite.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/net/http_server_properties_manager_unittest.cc
===================================================================
--- chrome/browser/net/http_server_properties_manager_unittest.cc (revision 126086)
+++ chrome/browser/net/http_server_properties_manager_unittest.cc (working copy)
@@ -281,9 +281,7 @@
// 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);
@@ -302,6 +300,30 @@
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();
@@ -359,9 +381,7 @@
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);
« no previous file with comments | « chrome/browser/net/http_server_properties_manager.cc ('k') | net/base/net_test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698