net/http/http_server_properties_manager_unittest.cc - Issue 1866983006: SHP 2: Change SpdySettingsMap to use SchemeHostPort as the key. No change to Pref data.

Unified Diff: net/http/http_server_properties_manager_unittest.cc

Issue 1866983006: SHP 2: Change SpdySettingsMap to use SchemeHostPort as the key. No change to Pref data. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@SHP_1

Patch Set: remove commented line Created 4 years, 8 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

Index: net/http/http_server_properties_manager_unittest.cc

diff --git a/net/http/http_server_properties_manager_unittest.cc b/net/http/http_server_properties_manager_unittest.cc

index d2278c54a3489d6a98dc86e31d0decae437bf132..81c999fa4e6ab320fd072a209d1d738c96131292 100644

--- a/net/http/http_server_properties_manager_unittest.cc

+++ b/net/http/http_server_properties_manager_unittest.cc

@@ -588,7 +588,7 @@ TEST_P(HttpServerPropertiesManagerTest, SetSpdySetting) {

ExpectScheduleUpdatePrefsOnNetworkThread();

// Add SpdySetting for mail.google.com:443.

- HostPortPair spdy_server_mail("mail.google.com", 443);

+ url::SchemeHostPort spdy_server_mail("https", "mail.google.com", 443);

const SpdySettingsIds id1 = SETTINGS_UPLOAD_BANDWIDTH;

const SpdySettingsFlags flags1 = SETTINGS_FLAG_PLEASE_PERSIST;

const uint32_t value1 = 31337;

@@ -615,7 +615,7 @@ TEST_P(HttpServerPropertiesManagerTest, ClearSpdySetting) {

ExpectScheduleUpdatePrefsOnNetworkThreadRepeatedly();

// Add SpdySetting for mail.google.com:443.

- HostPortPair spdy_server_mail("mail.google.com", 443);

+ url::SchemeHostPort spdy_server_mail("https", "mail.google.com", 443);

const SpdySettingsIds id1 = SETTINGS_UPLOAD_BANDWIDTH;

const SpdySettingsFlags flags1 = SETTINGS_FLAG_PLEASE_PERSIST;

const uint32_t value1 = 31337;

@@ -654,7 +654,7 @@ TEST_P(HttpServerPropertiesManagerTest, ClearAllSpdySetting) {

ExpectScheduleUpdatePrefsOnNetworkThreadRepeatedly();

// Add SpdySetting for mail.google.com:443.

- HostPortPair spdy_server_mail("mail.google.com", 443);

+ url::SchemeHostPort spdy_server_mail("https", "mail.google.com", 443);

const SpdySettingsIds id1 = SETTINGS_UPLOAD_BANDWIDTH;

const SpdySettingsFlags flags1 = SETTINGS_FLAG_PLEASE_PERSIST;

const uint32_t value1 = 31337;

@@ -914,8 +914,7 @@ TEST_P(HttpServerPropertiesManagerTest, Clear) {

const SpdySettingsIds id1 = SETTINGS_UPLOAD_BANDWIDTH;

const SpdySettingsFlags flags1 = SETTINGS_FLAG_PLEASE_PERSIST;

const uint32_t value1 = 31337;

- http_server_props_manager_->SetSpdySetting(spdy_server_mail, id1, flags1,

- value1);

+ http_server_props_manager_->SetSpdySetting(spdy_server, id1, flags1, value1);

// Run the task.

base::RunLoop().RunUntilIdle();

@@ -933,7 +932,7 @@ TEST_P(HttpServerPropertiesManagerTest, Clear) {

// Check SPDY settings values.

const SettingsMap& settings_map1_ret =

- http_server_props_manager_->GetSpdySettings(spdy_server_mail);

+ http_server_props_manager_->GetSpdySettings(spdy_server);

ASSERT_EQ(1U, settings_map1_ret.size());

SettingsMap::const_iterator it1_ret = settings_map1_ret.find(id1);

EXPECT_TRUE(it1_ret != settings_map1_ret.end());

@@ -960,7 +959,7 @@ TEST_P(HttpServerPropertiesManagerTest, Clear) {

http_server_props_manager_->GetQuicServerInfo(mail_quic_server_id));

const SettingsMap& settings_map2_ret =

- http_server_props_manager_->GetSpdySettings(spdy_server_mail);

+ http_server_props_manager_->GetSpdySettings(spdy_server);

EXPECT_EQ(0U, settings_map2_ret.size());

Mock::VerifyAndClearExpectations(http_server_props_manager_.get());

« no previous file with comments | « net/http/http_server_properties_manager.cc ('k') | net/spdy/spdy_network_transaction_unittest.cc » ('j') | net/spdy/spdy_session.cc » ('J')