| Index: net/quic/quic_server_id_test.cc
|
| diff --git a/net/quic/quic_server_id_test.cc b/net/quic/quic_server_id_test.cc
|
| index 4a9c0f3cd8011cb70e3b49e2dfc25a74eddcdc2f..24f425685080e7ea2bd60e4570aabc70df0533bc 100644
|
| --- a/net/quic/quic_server_id_test.cc
|
| +++ b/net/quic/quic_server_id_test.cc
|
| @@ -15,81 +15,81 @@ namespace {
|
| TEST(QuicServerIdTest, ToString) {
|
| HostPortPair google_host_port_pair("google.com", 10);
|
|
|
| - QuicServerId google_http_server_id(google_host_port_pair, false,
|
| - PRIVACY_MODE_DISABLED);
|
| + QuicServerId google_http_server_id(
|
| + google_host_port_pair, false, PRIVACY_MODE_DISABLED);
|
| string google_http_server_id_str = google_http_server_id.ToString();
|
| EXPECT_EQ("http://google.com:10", google_http_server_id_str);
|
|
|
| - QuicServerId google_https_server_id(google_host_port_pair, true,
|
| - PRIVACY_MODE_DISABLED);
|
| + QuicServerId google_https_server_id(
|
| + google_host_port_pair, true, PRIVACY_MODE_DISABLED);
|
| string google_https_server_id_str = google_https_server_id.ToString();
|
| EXPECT_EQ("https://google.com:10", google_https_server_id_str);
|
|
|
| - QuicServerId private_http_server_id(google_host_port_pair, false,
|
| - PRIVACY_MODE_ENABLED);
|
| + QuicServerId private_http_server_id(
|
| + google_host_port_pair, false, PRIVACY_MODE_ENABLED);
|
| string private_http_server_id_str = private_http_server_id.ToString();
|
| EXPECT_EQ("http://google.com:10/private", private_http_server_id_str);
|
|
|
| - QuicServerId private_https_server_id(google_host_port_pair, true,
|
| - PRIVACY_MODE_ENABLED);
|
| + QuicServerId private_https_server_id(
|
| + google_host_port_pair, true, PRIVACY_MODE_ENABLED);
|
| string private_https_server_id_str = private_https_server_id.ToString();
|
| EXPECT_EQ("https://google.com:10/private", private_https_server_id_str);
|
| }
|
|
|
| TEST(QuicServerIdTest, LessThan) {
|
| - QuicServerId a_10_http(HostPortPair("a.com", 10), false,
|
| - PRIVACY_MODE_DISABLED);
|
| - QuicServerId a_10_https(HostPortPair("a.com", 10), true,
|
| - PRIVACY_MODE_DISABLED);
|
| - QuicServerId a_11_http(HostPortPair("a.com", 11), false,
|
| - PRIVACY_MODE_DISABLED);
|
| - QuicServerId a_11_https(HostPortPair("a.com", 11), true,
|
| - PRIVACY_MODE_DISABLED);
|
| - QuicServerId b_10_http(HostPortPair("b.com", 10), false,
|
| - PRIVACY_MODE_DISABLED);
|
| - QuicServerId b_10_https(HostPortPair("b.com", 10), true,
|
| - PRIVACY_MODE_DISABLED);
|
| - QuicServerId b_11_http(HostPortPair("b.com", 11), false,
|
| - PRIVACY_MODE_DISABLED);
|
| - QuicServerId b_11_https(HostPortPair("b.com", 11), true,
|
| - PRIVACY_MODE_DISABLED);
|
| -
|
| - QuicServerId a_10_http_private(HostPortPair("a.com", 10), false,
|
| - PRIVACY_MODE_ENABLED);
|
| - QuicServerId a_10_https_private(HostPortPair("a.com", 10), true,
|
| - PRIVACY_MODE_ENABLED);
|
| - QuicServerId a_11_http_private(HostPortPair("a.com", 11), false,
|
| - PRIVACY_MODE_ENABLED);
|
| - QuicServerId a_11_https_private(HostPortPair("a.com", 11), true,
|
| - PRIVACY_MODE_ENABLED);
|
| - QuicServerId b_10_http_private(HostPortPair("b.com", 10), false,
|
| - PRIVACY_MODE_ENABLED);
|
| - QuicServerId b_10_https_private(HostPortPair("b.com", 10), true,
|
| - PRIVACY_MODE_ENABLED);
|
| - QuicServerId b_11_http_private(HostPortPair("b.com", 11), false,
|
| - PRIVACY_MODE_ENABLED);
|
| - QuicServerId b_11_https_private(HostPortPair("b.com", 11), true,
|
| - PRIVACY_MODE_ENABLED);
|
| + QuicServerId a_10_http(
|
| + HostPortPair("a.com", 10), false, PRIVACY_MODE_DISABLED);
|
| + QuicServerId a_10_https(
|
| + HostPortPair("a.com", 10), true, PRIVACY_MODE_DISABLED);
|
| + QuicServerId a_11_http(
|
| + HostPortPair("a.com", 11), false, PRIVACY_MODE_DISABLED);
|
| + QuicServerId a_11_https(
|
| + HostPortPair("a.com", 11), true, PRIVACY_MODE_DISABLED);
|
| + QuicServerId b_10_http(
|
| + HostPortPair("b.com", 10), false, PRIVACY_MODE_DISABLED);
|
| + QuicServerId b_10_https(
|
| + HostPortPair("b.com", 10), true, PRIVACY_MODE_DISABLED);
|
| + QuicServerId b_11_http(
|
| + HostPortPair("b.com", 11), false, PRIVACY_MODE_DISABLED);
|
| + QuicServerId b_11_https(
|
| + HostPortPair("b.com", 11), true, PRIVACY_MODE_DISABLED);
|
| +
|
| + QuicServerId a_10_http_private(
|
| + HostPortPair("a.com", 10), false, PRIVACY_MODE_ENABLED);
|
| + QuicServerId a_10_https_private(
|
| + HostPortPair("a.com", 10), true, PRIVACY_MODE_ENABLED);
|
| + QuicServerId a_11_http_private(
|
| + HostPortPair("a.com", 11), false, PRIVACY_MODE_ENABLED);
|
| + QuicServerId a_11_https_private(
|
| + HostPortPair("a.com", 11), true, PRIVACY_MODE_ENABLED);
|
| + QuicServerId b_10_http_private(
|
| + HostPortPair("b.com", 10), false, PRIVACY_MODE_ENABLED);
|
| + QuicServerId b_10_https_private(
|
| + HostPortPair("b.com", 10), true, PRIVACY_MODE_ENABLED);
|
| + QuicServerId b_11_http_private(
|
| + HostPortPair("b.com", 11), false, PRIVACY_MODE_ENABLED);
|
| + QuicServerId b_11_https_private(
|
| + HostPortPair("b.com", 11), true, PRIVACY_MODE_ENABLED);
|
|
|
| // Test combinations of host, port, https and privacy being same on left and
|
| // right side of less than.
|
| - EXPECT_FALSE(a_10_http < a_10_http);
|
| - EXPECT_TRUE(a_10_http < a_10_https);
|
| + EXPECT_FALSE(a_10_http < a_10_http);
|
| + EXPECT_TRUE(a_10_http < a_10_https);
|
| EXPECT_FALSE(a_10_https < a_10_http);
|
| EXPECT_FALSE(a_10_https < a_10_https);
|
|
|
| - EXPECT_TRUE(a_10_http < a_10_http_private);
|
| - EXPECT_TRUE(a_10_http < a_10_https_private);
|
| + EXPECT_TRUE(a_10_http < a_10_http_private);
|
| + EXPECT_TRUE(a_10_http < a_10_https_private);
|
| EXPECT_FALSE(a_10_https < a_10_http_private);
|
| - EXPECT_TRUE(a_10_https < a_10_https_private);
|
| + EXPECT_TRUE(a_10_https < a_10_https_private);
|
|
|
| - EXPECT_FALSE(a_10_http_private < a_10_http);
|
| - EXPECT_TRUE(a_10_http_private < a_10_https);
|
| + EXPECT_FALSE(a_10_http_private < a_10_http);
|
| + EXPECT_TRUE(a_10_http_private < a_10_https);
|
| EXPECT_FALSE(a_10_https_private < a_10_http);
|
| EXPECT_FALSE(a_10_https_private < a_10_https);
|
|
|
| - EXPECT_FALSE(a_10_http_private < a_10_http_private);
|
| - EXPECT_TRUE(a_10_http_private < a_10_https_private);
|
| + EXPECT_FALSE(a_10_http_private < a_10_http_private);
|
| + EXPECT_TRUE(a_10_http_private < a_10_https_private);
|
| EXPECT_FALSE(a_10_https_private < a_10_http_private);
|
| EXPECT_FALSE(a_10_https_private < a_10_https_private);
|
|
|
| @@ -116,97 +116,97 @@ TEST(QuicServerIdTest, LessThan) {
|
| right_privacy = PRIVACY_MODE_ENABLED;
|
| break;
|
| }
|
| - QuicServerId a_10_http_left_private(HostPortPair("a.com", 10), false,
|
| - left_privacy);
|
| - QuicServerId a_10_http_right_private(HostPortPair("a.com", 10), false,
|
| - right_privacy);
|
| - QuicServerId a_10_https_left_private(HostPortPair("a.com", 10), true,
|
| - left_privacy);
|
| - QuicServerId a_10_https_right_private(HostPortPair("a.com", 10), true,
|
| - right_privacy);
|
| - QuicServerId a_11_http_left_private(HostPortPair("a.com", 11), false,
|
| - left_privacy);
|
| - QuicServerId a_11_http_right_private(HostPortPair("a.com", 11), false,
|
| - right_privacy);
|
| - QuicServerId a_11_https_left_private(HostPortPair("a.com", 11), true,
|
| - left_privacy);
|
| - QuicServerId a_11_https_right_private(HostPortPair("a.com", 11), true,
|
| - right_privacy);
|
| -
|
| - QuicServerId b_10_http_left_private(HostPortPair("b.com", 10), false,
|
| - left_privacy);
|
| - QuicServerId b_10_http_right_private(HostPortPair("b.com", 10), false,
|
| - right_privacy);
|
| - QuicServerId b_10_https_left_private(HostPortPair("b.com", 10), true,
|
| - left_privacy);
|
| - QuicServerId b_10_https_right_private(HostPortPair("b.com", 10), true,
|
| - right_privacy);
|
| - QuicServerId b_11_http_left_private(HostPortPair("b.com", 11), false,
|
| - left_privacy);
|
| - QuicServerId b_11_http_right_private(HostPortPair("b.com", 11), false,
|
| - right_privacy);
|
| - QuicServerId b_11_https_left_private(HostPortPair("b.com", 11), true,
|
| - left_privacy);
|
| - QuicServerId b_11_https_right_private(HostPortPair("b.com", 11), true,
|
| - right_privacy);
|
| -
|
| - EXPECT_TRUE(a_10_http_left_private < a_11_http_right_private);
|
| - EXPECT_TRUE(a_10_http_left_private < a_11_https_right_private);
|
| + QuicServerId a_10_http_left_private(
|
| + HostPortPair("a.com", 10), false, left_privacy);
|
| + QuicServerId a_10_http_right_private(
|
| + HostPortPair("a.com", 10), false, right_privacy);
|
| + QuicServerId a_10_https_left_private(
|
| + HostPortPair("a.com", 10), true, left_privacy);
|
| + QuicServerId a_10_https_right_private(
|
| + HostPortPair("a.com", 10), true, right_privacy);
|
| + QuicServerId a_11_http_left_private(
|
| + HostPortPair("a.com", 11), false, left_privacy);
|
| + QuicServerId a_11_http_right_private(
|
| + HostPortPair("a.com", 11), false, right_privacy);
|
| + QuicServerId a_11_https_left_private(
|
| + HostPortPair("a.com", 11), true, left_privacy);
|
| + QuicServerId a_11_https_right_private(
|
| + HostPortPair("a.com", 11), true, right_privacy);
|
| +
|
| + QuicServerId b_10_http_left_private(
|
| + HostPortPair("b.com", 10), false, left_privacy);
|
| + QuicServerId b_10_http_right_private(
|
| + HostPortPair("b.com", 10), false, right_privacy);
|
| + QuicServerId b_10_https_left_private(
|
| + HostPortPair("b.com", 10), true, left_privacy);
|
| + QuicServerId b_10_https_right_private(
|
| + HostPortPair("b.com", 10), true, right_privacy);
|
| + QuicServerId b_11_http_left_private(
|
| + HostPortPair("b.com", 11), false, left_privacy);
|
| + QuicServerId b_11_http_right_private(
|
| + HostPortPair("b.com", 11), false, right_privacy);
|
| + QuicServerId b_11_https_left_private(
|
| + HostPortPair("b.com", 11), true, left_privacy);
|
| + QuicServerId b_11_https_right_private(
|
| + HostPortPair("b.com", 11), true, right_privacy);
|
| +
|
| + EXPECT_TRUE(a_10_http_left_private < a_11_http_right_private);
|
| + EXPECT_TRUE(a_10_http_left_private < a_11_https_right_private);
|
| EXPECT_TRUE(a_10_https_left_private < a_11_http_right_private);
|
| EXPECT_TRUE(a_10_https_left_private < a_11_https_right_private);
|
|
|
| - EXPECT_TRUE(a_10_http_left_private < b_10_http_right_private);
|
| - EXPECT_TRUE(a_10_http_left_private < b_10_https_right_private);
|
| + EXPECT_TRUE(a_10_http_left_private < b_10_http_right_private);
|
| + EXPECT_TRUE(a_10_http_left_private < b_10_https_right_private);
|
| EXPECT_TRUE(a_10_https_left_private < b_10_http_right_private);
|
| EXPECT_TRUE(a_10_https_left_private < b_10_https_right_private);
|
|
|
| - EXPECT_TRUE(a_10_http_left_private < b_11_http_right_private);
|
| - EXPECT_TRUE(a_10_http_left_private < b_11_https_right_private);
|
| + EXPECT_TRUE(a_10_http_left_private < b_11_http_right_private);
|
| + EXPECT_TRUE(a_10_http_left_private < b_11_https_right_private);
|
| EXPECT_TRUE(a_10_https_left_private < b_11_http_right_private);
|
| EXPECT_TRUE(a_10_https_left_private < b_11_https_right_private);
|
|
|
| - EXPECT_FALSE(a_11_http_left_private < a_10_http_right_private);
|
| - EXPECT_FALSE(a_11_http_left_private < a_10_https_right_private);
|
| + EXPECT_FALSE(a_11_http_left_private < a_10_http_right_private);
|
| + EXPECT_FALSE(a_11_http_left_private < a_10_https_right_private);
|
| EXPECT_FALSE(a_11_https_left_private < a_10_http_right_private);
|
| EXPECT_FALSE(a_11_https_left_private < a_10_https_right_private);
|
|
|
| - EXPECT_FALSE(a_11_http_left_private < b_10_http_right_private);
|
| - EXPECT_FALSE(a_11_http_left_private < b_10_https_right_private);
|
| + EXPECT_FALSE(a_11_http_left_private < b_10_http_right_private);
|
| + EXPECT_FALSE(a_11_http_left_private < b_10_https_right_private);
|
| EXPECT_FALSE(a_11_https_left_private < b_10_http_right_private);
|
| EXPECT_FALSE(a_11_https_left_private < b_10_https_right_private);
|
|
|
| - EXPECT_TRUE(a_11_http_left_private < b_11_http_right_private);
|
| - EXPECT_TRUE(a_11_http_left_private < b_11_https_right_private);
|
| + EXPECT_TRUE(a_11_http_left_private < b_11_http_right_private);
|
| + EXPECT_TRUE(a_11_http_left_private < b_11_https_right_private);
|
| EXPECT_TRUE(a_11_https_left_private < b_11_http_right_private);
|
| EXPECT_TRUE(a_11_https_left_private < b_11_https_right_private);
|
|
|
| - EXPECT_FALSE(b_10_http_left_private < a_10_http_right_private);
|
| - EXPECT_FALSE(b_10_http_left_private < a_10_https_right_private);
|
| + EXPECT_FALSE(b_10_http_left_private < a_10_http_right_private);
|
| + EXPECT_FALSE(b_10_http_left_private < a_10_https_right_private);
|
| EXPECT_FALSE(b_10_https_left_private < a_10_http_right_private);
|
| EXPECT_FALSE(b_10_https_left_private < a_10_https_right_private);
|
|
|
| - EXPECT_TRUE(b_10_http_left_private < a_11_http_right_private);
|
| - EXPECT_TRUE(b_10_http_left_private < a_11_https_right_private);
|
| + EXPECT_TRUE(b_10_http_left_private < a_11_http_right_private);
|
| + EXPECT_TRUE(b_10_http_left_private < a_11_https_right_private);
|
| EXPECT_TRUE(b_10_https_left_private < a_11_http_right_private);
|
| EXPECT_TRUE(b_10_https_left_private < a_11_https_right_private);
|
|
|
| - EXPECT_TRUE(b_10_http_left_private < b_11_http_right_private);
|
| - EXPECT_TRUE(b_10_http_left_private < b_11_https_right_private);
|
| + EXPECT_TRUE(b_10_http_left_private < b_11_http_right_private);
|
| + EXPECT_TRUE(b_10_http_left_private < b_11_https_right_private);
|
| EXPECT_TRUE(b_10_https_left_private < b_11_http_right_private);
|
| EXPECT_TRUE(b_10_https_left_private < b_11_https_right_private);
|
|
|
| - EXPECT_FALSE(b_11_http_left_private < a_10_http_right_private);
|
| - EXPECT_FALSE(b_11_http_left_private < a_10_https_right_private);
|
| + EXPECT_FALSE(b_11_http_left_private < a_10_http_right_private);
|
| + EXPECT_FALSE(b_11_http_left_private < a_10_https_right_private);
|
| EXPECT_FALSE(b_11_https_left_private < a_10_http_right_private);
|
| EXPECT_FALSE(b_11_https_left_private < a_10_https_right_private);
|
|
|
| - EXPECT_FALSE(b_11_http_left_private < a_11_http_right_private);
|
| - EXPECT_FALSE(b_11_http_left_private < a_11_https_right_private);
|
| + EXPECT_FALSE(b_11_http_left_private < a_11_http_right_private);
|
| + EXPECT_FALSE(b_11_http_left_private < a_11_https_right_private);
|
| EXPECT_FALSE(b_11_https_left_private < a_11_http_right_private);
|
| EXPECT_FALSE(b_11_https_left_private < a_11_https_right_private);
|
|
|
| - EXPECT_FALSE(b_11_http_left_private < b_10_http_right_private);
|
| - EXPECT_FALSE(b_11_http_left_private < b_10_https_right_private);
|
| + EXPECT_FALSE(b_11_http_left_private < b_10_http_right_private);
|
| + EXPECT_FALSE(b_11_http_left_private < b_10_https_right_private);
|
| EXPECT_FALSE(b_11_https_left_private < b_10_http_right_private);
|
| EXPECT_FALSE(b_11_https_left_private < b_10_https_right_private);
|
| }
|
| @@ -226,47 +226,47 @@ TEST(QuicServerIdTest, Equals) {
|
| right_privacy = PRIVACY_MODE_ENABLED;
|
| break;
|
| }
|
| - QuicServerId a_10_http_right_private(HostPortPair("a.com", 10), false,
|
| - right_privacy);
|
| - QuicServerId a_10_https_right_private(HostPortPair("a.com", 10), true,
|
| - right_privacy);
|
| - QuicServerId a_11_http_right_private(HostPortPair("a.com", 11), false,
|
| - right_privacy);
|
| - QuicServerId a_11_https_right_private(HostPortPair("a.com", 11), true,
|
| - right_privacy);
|
| - QuicServerId b_10_http_right_private(HostPortPair("b.com", 10), false,
|
| - right_privacy);
|
| - QuicServerId b_10_https_right_private(HostPortPair("b.com", 10), true,
|
| - right_privacy);
|
| - QuicServerId b_11_http_right_private(HostPortPair("b.com", 11), false,
|
| - right_privacy);
|
| - QuicServerId b_11_https_right_private(HostPortPair("b.com", 11), true,
|
| - right_privacy);
|
| -
|
| - QuicServerId new_a_10_http_left_private(HostPortPair("a.com", 10), false,
|
| - left_privacy);
|
| - QuicServerId new_a_10_https_left_private(HostPortPair("a.com", 10), true,
|
| - left_privacy);
|
| - QuicServerId new_a_11_http_left_private(HostPortPair("a.com", 11), false,
|
| - left_privacy);
|
| - QuicServerId new_a_11_https_left_private(HostPortPair("a.com", 11), true,
|
| - left_privacy);
|
| - QuicServerId new_b_10_http_left_private(HostPortPair("b.com", 10), false,
|
| - left_privacy);
|
| - QuicServerId new_b_10_https_left_private(HostPortPair("b.com", 10), true,
|
| - left_privacy);
|
| - QuicServerId new_b_11_http_left_private(HostPortPair("b.com", 11), false,
|
| - left_privacy);
|
| - QuicServerId new_b_11_https_left_private(HostPortPair("b.com", 11), true,
|
| - left_privacy);
|
| -
|
| - EXPECT_EQ(new_a_10_http_left_private, a_10_http_right_private);
|
| + QuicServerId a_10_http_right_private(
|
| + HostPortPair("a.com", 10), false, right_privacy);
|
| + QuicServerId a_10_https_right_private(
|
| + HostPortPair("a.com", 10), true, right_privacy);
|
| + QuicServerId a_11_http_right_private(
|
| + HostPortPair("a.com", 11), false, right_privacy);
|
| + QuicServerId a_11_https_right_private(
|
| + HostPortPair("a.com", 11), true, right_privacy);
|
| + QuicServerId b_10_http_right_private(
|
| + HostPortPair("b.com", 10), false, right_privacy);
|
| + QuicServerId b_10_https_right_private(
|
| + HostPortPair("b.com", 10), true, right_privacy);
|
| + QuicServerId b_11_http_right_private(
|
| + HostPortPair("b.com", 11), false, right_privacy);
|
| + QuicServerId b_11_https_right_private(
|
| + HostPortPair("b.com", 11), true, right_privacy);
|
| +
|
| + QuicServerId new_a_10_http_left_private(
|
| + HostPortPair("a.com", 10), false, left_privacy);
|
| + QuicServerId new_a_10_https_left_private(
|
| + HostPortPair("a.com", 10), true, left_privacy);
|
| + QuicServerId new_a_11_http_left_private(
|
| + HostPortPair("a.com", 11), false, left_privacy);
|
| + QuicServerId new_a_11_https_left_private(
|
| + HostPortPair("a.com", 11), true, left_privacy);
|
| + QuicServerId new_b_10_http_left_private(
|
| + HostPortPair("b.com", 10), false, left_privacy);
|
| + QuicServerId new_b_10_https_left_private(
|
| + HostPortPair("b.com", 10), true, left_privacy);
|
| + QuicServerId new_b_11_http_left_private(
|
| + HostPortPair("b.com", 11), false, left_privacy);
|
| + QuicServerId new_b_11_https_left_private(
|
| + HostPortPair("b.com", 11), true, left_privacy);
|
| +
|
| + EXPECT_EQ(new_a_10_http_left_private, a_10_http_right_private);
|
| EXPECT_EQ(new_a_10_https_left_private, a_10_https_right_private);
|
| - EXPECT_EQ(new_a_11_http_left_private, a_11_http_right_private);
|
| + EXPECT_EQ(new_a_11_http_left_private, a_11_http_right_private);
|
| EXPECT_EQ(new_a_11_https_left_private, a_11_https_right_private);
|
| - EXPECT_EQ(new_b_10_http_left_private, b_10_http_right_private);
|
| + EXPECT_EQ(new_b_10_http_left_private, b_10_http_right_private);
|
| EXPECT_EQ(new_b_10_https_left_private, b_10_https_right_private);
|
| - EXPECT_EQ(new_b_11_http_left_private, b_11_http_right_private);
|
| + EXPECT_EQ(new_b_11_http_left_private, b_11_http_right_private);
|
| EXPECT_EQ(new_b_11_https_left_private, b_11_https_right_private);
|
| }
|
|
|
| @@ -279,25 +279,25 @@ TEST(QuicServerIdTest, Equals) {
|
| right_privacy = PRIVACY_MODE_ENABLED;
|
| break;
|
| }
|
| - QuicServerId a_10_http_right_private(HostPortPair("a.com", 10), false,
|
| - right_privacy);
|
| - QuicServerId a_10_https_right_private(HostPortPair("a.com", 10), true,
|
| - right_privacy);
|
| - QuicServerId a_11_http_right_private(HostPortPair("a.com", 11), false,
|
| - right_privacy);
|
| - QuicServerId a_11_https_right_private(HostPortPair("a.com", 11), true,
|
| - right_privacy);
|
| - QuicServerId b_10_http_right_private(HostPortPair("b.com", 10), false,
|
| - right_privacy);
|
| - QuicServerId b_10_https_right_private(HostPortPair("b.com", 10), true,
|
| - right_privacy);
|
| - QuicServerId b_11_http_right_private(HostPortPair("b.com", 11), false,
|
| - right_privacy);
|
| - QuicServerId b_11_https_right_private(HostPortPair("b.com", 11), true,
|
| - right_privacy);
|
| -
|
| - QuicServerId new_a_10_http_left_private(HostPortPair("a.com", 10), false,
|
| - PRIVACY_MODE_DISABLED);
|
| + QuicServerId a_10_http_right_private(
|
| + HostPortPair("a.com", 10), false, right_privacy);
|
| + QuicServerId a_10_https_right_private(
|
| + HostPortPair("a.com", 10), true, right_privacy);
|
| + QuicServerId a_11_http_right_private(
|
| + HostPortPair("a.com", 11), false, right_privacy);
|
| + QuicServerId a_11_https_right_private(
|
| + HostPortPair("a.com", 11), true, right_privacy);
|
| + QuicServerId b_10_http_right_private(
|
| + HostPortPair("b.com", 10), false, right_privacy);
|
| + QuicServerId b_10_https_right_private(
|
| + HostPortPair("b.com", 10), true, right_privacy);
|
| + QuicServerId b_11_http_right_private(
|
| + HostPortPair("b.com", 11), false, right_privacy);
|
| + QuicServerId b_11_https_right_private(
|
| + HostPortPair("b.com", 11), true, right_privacy);
|
| +
|
| + QuicServerId new_a_10_http_left_private(
|
| + HostPortPair("a.com", 10), false, PRIVACY_MODE_DISABLED);
|
|
|
| EXPECT_FALSE(new_a_10_http_left_private == a_10_https_right_private);
|
| EXPECT_FALSE(new_a_10_http_left_private == a_11_http_right_private);
|
| @@ -307,10 +307,10 @@ TEST(QuicServerIdTest, Equals) {
|
| EXPECT_FALSE(new_a_10_http_left_private == b_11_http_right_private);
|
| EXPECT_FALSE(new_a_10_http_left_private == b_11_https_right_private);
|
| }
|
| - QuicServerId a_10_http_private(HostPortPair("a.com", 10), false,
|
| - PRIVACY_MODE_ENABLED);
|
| - QuicServerId new_a_10_http_no_private(HostPortPair("a.com", 10), false,
|
| - PRIVACY_MODE_DISABLED);
|
| + QuicServerId a_10_http_private(
|
| + HostPortPair("a.com", 10), false, PRIVACY_MODE_ENABLED);
|
| + QuicServerId new_a_10_http_no_private(
|
| + HostPortPair("a.com", 10), false, PRIVACY_MODE_DISABLED);
|
| EXPECT_FALSE(new_a_10_http_no_private == a_10_http_private);
|
| }
|
|
|
|
|