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

net/spdy/spdy_protocol_test.cc

Index: net/spdy/spdy_protocol_test.cc
diff --git a/net/spdy/spdy_protocol_test.cc b/net/spdy/spdy_protocol_test.cc
index 59323287d448907208cbe946ba9ce679527a5b6a..b15783a4853e79dcad8c3fc8ae21c870c1a4852d 100644
--- a/net/spdy/spdy_protocol_test.cc
+++ b/net/spdy/spdy_protocol_test.cc
@@ -16,8 +16,8 @@
 namespace {
 
 enum SpdyProtocolTestTypes {
-  SPDY2 = 2,
-  SPDY3 = 3,
+  SPDY2 = net::SPDY2,
+  SPDY3 = net::SPDY3,
 };
 
 }  // namespace
@@ -28,11 +28,11 @@ 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.