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

Unified Diff: net/quic/quic_server_id_test.cc

Issue 371213002: Fixes for re-enabling more MSVC level 4 warnings: net/quic/ edition (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review comments Created 6 years, 5 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 | « net/quic/crypto/strike_register.cc ('k') | net/quic/quic_spdy_server_stream.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..1e08b30d50f8ecb627d876b4f46f8c52f85faf16 100644
--- a/net/quic/quic_server_id_test.cc
+++ b/net/quic/quic_server_id_test.cc
@@ -98,24 +98,8 @@ TEST(QuicServerIdTest, LessThan) {
PrivacyMode left_privacy;
PrivacyMode right_privacy;
for (int i = 0; i < 4; i++) {
- switch (i) {
- case 0:
- left_privacy = PRIVACY_MODE_DISABLED;
- right_privacy = PRIVACY_MODE_DISABLED;
- break;
- case 1:
- left_privacy = PRIVACY_MODE_DISABLED;
- right_privacy = PRIVACY_MODE_ENABLED;
- break;
- case 2:
- left_privacy = PRIVACY_MODE_ENABLED;
- right_privacy = PRIVACY_MODE_DISABLED;
- break;
- case 3:
- left_privacy = PRIVACY_MODE_ENABLED;
- right_privacy = PRIVACY_MODE_ENABLED;
- break;
- }
+ left_privacy = static_cast<PrivacyMode>(i / 2);
+ right_privacy = static_cast<PrivacyMode>(i % 2);
QuicServerId a_10_http_left_private(HostPortPair("a.com", 10), false,
left_privacy);
QuicServerId a_10_http_right_private(HostPortPair("a.com", 10), false,
@@ -216,16 +200,7 @@ TEST(QuicServerIdTest, Equals) {
PrivacyMode left_privacy;
PrivacyMode right_privacy;
for (int i = 0; i < 2; i++) {
- switch (i) {
- case 0:
- left_privacy = PRIVACY_MODE_DISABLED;
- right_privacy = PRIVACY_MODE_DISABLED;
- break;
- case 1:
- left_privacy = PRIVACY_MODE_ENABLED;
- right_privacy = PRIVACY_MODE_ENABLED;
- break;
- }
+ left_privacy = right_privacy = static_cast<PrivacyMode>(i);
QuicServerId a_10_http_right_private(HostPortPair("a.com", 10), false,
right_privacy);
QuicServerId a_10_https_right_private(HostPortPair("a.com", 10), true,
@@ -271,14 +246,7 @@ TEST(QuicServerIdTest, Equals) {
}
for (int i = 0; i < 2; i++) {
- switch (i) {
- case 0:
- right_privacy = PRIVACY_MODE_DISABLED;
- break;
- case 1:
- right_privacy = PRIVACY_MODE_ENABLED;
- break;
- }
+ right_privacy = static_cast<PrivacyMode>(i);
QuicServerId a_10_http_right_private(HostPortPair("a.com", 10), false,
right_privacy);
QuicServerId a_10_https_right_private(HostPortPair("a.com", 10), true,
« no previous file with comments | « net/quic/crypto/strike_register.cc ('k') | net/quic/quic_spdy_server_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698