summaryrefslogtreecommitdiffstats
path: root/net/http/http_server_properties_manager_unittest.cc
diff options
context:
space:
mode:
authorbnc <bnc@chromium.org>2015-01-30 12:11:01 -0800
committerCommit bot <commit-bot@chromium.org>2015-01-30 20:12:12 +0000
commit1102b557d0fc13866a67a11d570b740e5528fb4e (patch)
tree19c29af50b77ae86aca544bbc0f563be51ad8fe2 /net/http/http_server_properties_manager_unittest.cc
parent69680cbf19624963fef33f2e9d5180078734f89f (diff)
downloadchromium_src-1102b557d0fc13866a67a11d570b740e5528fb4e.zip
chromium_src-1102b557d0fc13866a67a11d570b740e5528fb4e.tar.gz
chromium_src-1102b557d0fc13866a67a11d570b740e5528fb4e.tar.bz2
Lint.
Driveby lint while working on https://crrev.com/665083009. * Remove redundant net:: namespace qualifiers. * Remove one redundant line. * Change probability literals from int to float. * Fix typos in comments. * Add https to one link in a comment. * git cl format to fix one indent and to reduce number of lines. BUG=392575 Review URL: https://codereview.chromium.org/882973006 Cr-Commit-Position: refs/heads/master@{#313971}
Diffstat (limited to 'net/http/http_server_properties_manager_unittest.cc')
-rw-r--r--net/http/http_server_properties_manager_unittest.cc19
1 files changed, 9 insertions, 10 deletions
diff --git a/net/http/http_server_properties_manager_unittest.cc b/net/http/http_server_properties_manager_unittest.cc
index 99647b3f..66e588c 100644
--- a/net/http/http_server_properties_manager_unittest.cc
+++ b/net/http/http_server_properties_manager_unittest.cc
@@ -481,7 +481,7 @@ TEST_F(HttpServerPropertiesManagerTest, HasAlternateProtocol) {
EXPECT_FALSE(
http_server_props_manager_->HasAlternateProtocol(spdy_server_mail));
http_server_props_manager_->SetAlternateProtocol(spdy_server_mail, 443,
- NPN_SPDY_3, 1);
+ NPN_SPDY_3, 1.0);
// Run the task.
base::RunLoop().RunUntilIdle();
@@ -541,7 +541,7 @@ TEST_F(HttpServerPropertiesManagerTest, Clear) {
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,
- NPN_SPDY_3, 1);
+ NPN_SPDY_3, 1.0);
http_server_props_manager_->SetSupportsQuic(spdy_server_mail, true, "foo");
ServerNetworkStats stats;
stats.srtt = base::TimeDelta::FromMicroseconds(10);
@@ -603,7 +603,7 @@ TEST_F(HttpServerPropertiesManagerTest, Clear) {
Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
}
-// crbug.com/444956: Add 200 alternate_protocol servers followed by
+// https://crbug.com/444956: Add 200 alternate_protocol servers followed by
// supports_quic and verify we have read supports_quic from prefs.
TEST_F(HttpServerPropertiesManagerTest, BadSupportsQuic) {
ExpectCacheUpdate();
@@ -650,18 +650,17 @@ TEST_F(HttpServerPropertiesManagerTest, BadSupportsQuic) {
for (int i = 0; i < 200; ++i) {
std::string server = StringPrintf("www.google.com:%d", i);
ASSERT_TRUE(http_server_props_manager_->HasAlternateProtocol(
- net::HostPortPair::FromString(server)));
- net::AlternateProtocolInfo port_alternate_protocol =
+ HostPortPair::FromString(server)));
+ AlternateProtocolInfo port_alternate_protocol =
http_server_props_manager_->GetAlternateProtocol(
- net::HostPortPair::FromString(server));
+ HostPortPair::FromString(server));
EXPECT_EQ(i, port_alternate_protocol.port);
- EXPECT_EQ(net::NPN_SPDY_3, port_alternate_protocol.protocol);
+ EXPECT_EQ(NPN_SPDY_3, port_alternate_protocol.protocol);
}
// Verify SupportsQuic.
- net::SupportsQuic supports_quic1 =
- http_server_props_manager_->GetSupportsQuic(
- net::HostPortPair::FromString("mail.google.com:80"));
+ SupportsQuic supports_quic1 = http_server_props_manager_->GetSupportsQuic(
+ HostPortPair::FromString("mail.google.com:80"));
EXPECT_TRUE(supports_quic1.used_quic);
EXPECT_EQ("bar", supports_quic1.address);
}