SPDY & HPACK: Land recent internal changes (through 65328503)

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 <limits>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/spdy/spdy_bitmasks.h"
 #include "net/spdy/spdy_framer.h"
 #include "net/test/gtest_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 enum SpdyProtocolTestTypes {
-  SPDY2 = 2,
-  SPDY3 = 3,
+  SPDY2 = net::SPDY2,
+  SPDY3 = net::SPDY3,
 };
 
 }  // namespace
 
 namespace net {
 
 class SpdyProtocolTest
     : public ::testing::TestWithParam<SpdyProtocolTestTypes> {
  protected:
   virtual void SetUp() {
-    spdy_version_ = GetParam();
+    spdy_version_ = static_cast<SpdyMajorVersion>(GetParam());
   }
 
   // Version of SPDY protocol to be used.
-  int spdy_version_;
+  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));
 
 // Test our protocol constants
 TEST_P(SpdyProtocolTest, ProtocolConstants) {
   EXPECT_EQ(1, SYN_STREAM);
@@ skipping 26 matching lines @@
   EXPECT_DFATAL(flags_and_id.reset(new SettingsFlagsAndId(1, ~0)),
                 "SPDY setting ID too large.");
   // Make sure that we get expected values in opt mode.
   if (flags_and_id.get() != NULL) {
     EXPECT_EQ(1, flags_and_id->flags());
     EXPECT_EQ(static_cast<SpdyPingId>(0xffffff), flags_and_id->id());
   }
 }
 
 }  // namespace net