Clean up a raft of SPDY files

net/spdy/spdy_protocol_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/spdy/spdy_protocol.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "net/spdy/spdy_bitmasks.h"
 #include "net/spdy/spdy_framer.h"
 #include "testing/platform_test.h"
 
 namespace {
 
 enum SpdyProtocolTestTypes {
-  SPDY2,
-  SPDY3,
+  SPDY2 = 2,
+  SPDY3 = 3,
 };
 
 } // namespace
 
 namespace net {
 
 class SpdyProtocolTest
     : public ::testing::TestWithParam<SpdyProtocolTestTypes> {
  protected:
   virtual void SetUp() {
-    spdy_version_ = (GetParam() == SPDY2) ? 2 : 3;
+    spdy_version_ = GetParam();
   }
 
-  virtual void TearDown() {}
-
-  bool IsSpdy2() { return spdy_version_ < 3; }
+  bool IsSpdy2() { return spdy_version_ == SPDY2; }
 
   // Version of SPDY protocol to be used.
   int 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));
 
 // Test our protocol constants
 TEST_P(SpdyProtocolTest, ProtocolConstants) {
   EXPECT_EQ(8u, SpdyFrame::kHeaderSize);
   EXPECT_EQ(8u, SpdyDataFrame::size());
   EXPECT_EQ(8u, SpdyControlFrame::kHeaderSize);
@@ skipping 218 matching lines @@
       type = static_cast<SpdyControlType>(type + 1)) {
     frame.set_type(type);
     if (type == SYN_STREAM || type == SYN_REPLY || type == HEADERS) {
       EXPECT_TRUE(frame.has_header_block());
     } else {
       EXPECT_FALSE(frame.has_header_block());
     }
   }
 }
 
-//-----------------------------------------------------------------------------
-// All tests are run with two different SPDY versions: SPDY/2 and SPDY/3.
 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));
 
 // Make sure that overflows both die in debug mode, and do not cause problems
 // in opt mode.  Note:  The EXPECT_DEBUG_DEATH call does not work on Win32 yet,
 // so we comment it out.
 TEST_P(SpdyProtocolDeathTest, TestDataFrame) {
   SpdyDataFrame frame;
 
@@ skipping 92 matching lines @@
 
   rst_frame->set_status(
       static_cast<SpdyStatusCodes>(INVALID - 1));
   EXPECT_EQ(INVALID, rst_frame->status());
 
   rst_frame->set_status(NUM_STATUS_CODES);
   EXPECT_EQ(INVALID, rst_frame->status());
 }
 
 }  // namespace net