Switch to standard integer types in net/.

net/spdy/spdy_priority_tree_test.cc

 // Copyright 2014 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_priority_tree.h"
 
-#include "base/basictypes.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 
 using ::testing::ElementsAre;
 using ::testing::IsEmpty;
 using ::testing::UnorderedElementsAre;
 
 namespace test {
@@ skipping 19 matching lines @@
   bool ValidateInvariants() const {
     return tree_->ValidateInvariantsForTests();
   }
 
  private:
   SpdyPriorityTree<NodeId>* tree_;
 };
 
 class SpdyPriorityTreeTest : public ::testing::Test {
  protected:
-  typedef uint32 SpdyStreamId;
+  typedef uint32_t SpdyStreamId;
   typedef std::pair<SpdyStreamId, float> PriorityNode;
   typedef std::vector<PriorityNode> PriorityList;
 
   SpdyPriorityTreeTest() : peer(&tree) {}
 
   SpdyPriorityTree<SpdyStreamId> tree;
   SpdyPriorityTreePeer<SpdyStreamId> peer;
 };
 
 TEST_F(SpdyPriorityTreeTest, AddAndRemoveNodes) {
@@ skipping 541 matching lines @@
   EXPECT_EQ(3, tree.GetWeight(4));
   EXPECT_EQ(3, tree.GetWeight(5));
   // 2.5 rounded up = 3.
   EXPECT_EQ(3, tree.GetWeight(6));
   EXPECT_EQ(3, tree.GetWeight(7));
   // 0 is not a valid weight, so round up to 1.
   EXPECT_EQ(1, tree.GetWeight(8));
 }
 }  // namespace test
 }  // namespace gfe_spdy