Index: net/spdy/spdy_protocol_test.cc |
diff --git a/net/spdy/spdy_protocol_test.cc b/net/spdy/spdy_protocol_test.cc |
index 6117994aeea3855889ce00a9f52a3310dd9a337b..c224818447a021154a68a7d1a5412a35fa820394 100644 |
--- a/net/spdy/spdy_protocol_test.cc |
+++ b/net/spdy/spdy_protocol_test.cc |
@@ -14,47 +14,19 @@ |
namespace { |
-enum SpdyProtocolTestTypes { |
- SPDY2 = net::SPDY2, |
- SPDY3 = net::SPDY3, |
-}; |
- |
} // namespace |
namespace net { |
-class SpdyProtocolTest |
- : public ::testing::TestWithParam<SpdyProtocolTestTypes> { |
- protected: |
- void SetUp() override { |
- spdy_version_ = static_cast<SpdyMajorVersion>(GetParam()); |
- } |
- |
- // Version of SPDY protocol to be used. |
- SpdyMajorVersion spdy_version_; |
-}; |
- |
-// All tests are run with two different SPDY versions: SPDY/2 and SPDY/3. |
-INSTANTIATE_TEST_CASE_P(SpdyProtocolTests, |
- SpdyProtocolTest, |
- ::testing::Values(SPDY2, SPDY3)); |
- |
-class SpdyProtocolDeathTest : public SpdyProtocolTest {}; |
- |
-// All tests are run with two different SPDY versions: SPDY/2 and SPDY/3. |
-INSTANTIATE_TEST_CASE_P(SpdyProtocolDeathTests, |
- SpdyProtocolDeathTest, |
- ::testing::Values(SPDY2, SPDY3)); |
- |
-TEST_P(SpdyProtocolDeathTest, TestSpdySettingsAndIdOutOfBounds) { |
+TEST(SpdyProtocolDeathTest, TestSpdySettingsAndIdOutOfBounds) { |
scoped_ptr<SettingsFlagsAndId> flags_and_id; |
- EXPECT_DFATAL(flags_and_id.reset(new SettingsFlagsAndId(1, 0xFFFFFFFF)), |
+ EXPECT_DFATAL(flags_and_id.reset(new SettingsFlagsAndId(1, 0xffffffff)), |
"SPDY setting ID too large."); |
// Make sure that we get expected values in opt mode. |
- if (flags_and_id.get() != NULL) { |
+ if (flags_and_id.get() != nullptr) { |
EXPECT_EQ(1, flags_and_id->flags()); |
- EXPECT_EQ(static_cast<SpdyPingId>(0xffffff), flags_and_id->id()); |
+ EXPECT_EQ(0xffffffu, flags_and_id->id()); |
} |
} |