Clean up a raft of SPDY files

net/spdy/spdy_frame_reader_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 <algorithm>
 #include <iostream>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/sys_byteorder.h"
 #include "net/spdy/spdy_frame_reader.h"
 #include "testing/platform_test.h"
 
 namespace net {
 
 TEST(SpdyFrameReaderTest, ReadUInt16) {
   // Frame data in network byte order.
   const uint16 kFrameData[] = {
     htons(1), htons(1<<15),
   };
 
   SpdyFrameReader frame_reader(reinterpret_cast<const char *>(kFrameData),
                                arraysize(kFrameData) * sizeof(uint16));
   EXPECT_FALSE(frame_reader.IsDoneReading());
 
   uint16 uint16_val;
   EXPECT_TRUE(frame_reader.ReadUInt16(&uint16_val));
   EXPECT_FALSE(frame_reader.IsDoneReading());
-  EXPECT_EQ(1u, uint16_val);
+  EXPECT_EQ(1, uint16_val);
 
   EXPECT_TRUE(frame_reader.ReadUInt16(&uint16_val));
   EXPECT_TRUE(frame_reader.IsDoneReading());
   EXPECT_EQ(1<<15, uint16_val);
 }
 
 TEST(SpdyFrameReaderTest, ReadUInt32) {
   // Frame data in network byte order.
   const uint32 kFrameData[] = {
     htonl(1), htonl(1<<31),
   };
 
   SpdyFrameReader frame_reader(reinterpret_cast<const char *>(kFrameData),
                                arraysize(kFrameData) * sizeof(uint32));
   EXPECT_FALSE(frame_reader.IsDoneReading());
 
   uint32 uint32_val;
   EXPECT_TRUE(frame_reader.ReadUInt32(&uint32_val));
   EXPECT_FALSE(frame_reader.IsDoneReading());
   EXPECT_EQ(1u, uint32_val);
 
   EXPECT_TRUE(frame_reader.ReadUInt32(&uint32_val));
   EXPECT_TRUE(frame_reader.IsDoneReading());
-  EXPECT_EQ(static_cast<uint32>(1<<31), uint32_val);
+  EXPECT_EQ(1u<<31, uint32_val);
 }
 
 TEST(SpdyFrameReaderTest, ReadStringPiece16) {
   // Frame data in network byte order.
   const char kFrameData[] = {
     0x00, 0x02,  // uint16(2)
     0x48, 0x69,  // "Hi"
     0x00, 0x10,  // uint16(16)
     0x54, 0x65, 0x73, 0x74,
     0x69, 0x6e, 0x67, 0x2c,
@@ skipping 177 matching lines @@
 
   SpdyFrameReader frame_reader(kFrameData, arraysize(kFrameData));
   EXPECT_FALSE(frame_reader.IsDoneReading());
 
   char dest[arraysize(kFrameData) + 2] = {};
   EXPECT_FALSE(frame_reader.ReadBytes(&dest, arraysize(kFrameData) + 1));
   EXPECT_STREQ("", dest);
 }
 
 }  // namespace net