Switch to standard integer types in net/.

net/quic/crypto/local_strike_register_client_test.cc

 // Copyright 2013 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/quic/crypto/local_strike_register_client.h"
 
 #include <memory>
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_piece.h"
 #include "base/sys_byteorder.h"
 #include "net/quic/crypto/crypto_protocol.h"
 #include "net/quic/quic_time.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::StringPiece;
 using std::string;
 
@@ skipping 24 matching lines @@
   }
 
  private:
   bool* called_;
   bool* saved_value_;
   InsertStatus* saved_nonce_error_;
 
   DISALLOW_COPY_AND_ASSIGN(RecordResultCallback);
 };
 
-const uint8 kOrbit[] = "\x12\x34\x56\x78\x9A\xBC\xDE\xF0";
-const uint32 kCurrentTimeExternalSecs = 12345678;
+const uint8_t kOrbit[] = "\x12\x34\x56\x78\x9A\xBC\xDE\xF0";
+const uint32_t kCurrentTimeExternalSecs = 12345678;
 size_t kMaxEntries = 100;
-uint32 kWindowSecs = 60;
+uint32_t kWindowSecs = 60;
 
 class LocalStrikeRegisterClientTest : public ::testing::Test {
  protected:
   LocalStrikeRegisterClientTest() {}
 
   void SetUp() override {
     strike_register_.reset(new LocalStrikeRegisterClient(
         kMaxEntries, kCurrentTimeExternalSecs, kWindowSecs, kOrbit,
         StrikeRegister::NO_STARTUP_PERIOD_NEEDED));
   }
 
   scoped_ptr<LocalStrikeRegisterClient> strike_register_;
 };
 
 TEST_F(LocalStrikeRegisterClientTest, CheckOrbit) {
   EXPECT_TRUE(strike_register_->IsKnownOrbit(
       StringPiece(reinterpret_cast<const char*>(kOrbit), kOrbitSize)));
   EXPECT_FALSE(strike_register_->IsKnownOrbit(
       StringPiece(reinterpret_cast<const char*>(kOrbit), kOrbitSize - 1)));
   EXPECT_FALSE(strike_register_->IsKnownOrbit(
       StringPiece(reinterpret_cast<const char*>(kOrbit), kOrbitSize + 1)));
   EXPECT_FALSE(strike_register_->IsKnownOrbit(
       StringPiece(reinterpret_cast<const char*>(kOrbit) + 1, kOrbitSize)));
 }
 
 TEST_F(LocalStrikeRegisterClientTest, IncorrectNonceLength) {
   string valid_nonce;
-  uint32 norder = htonl(kCurrentTimeExternalSecs);
+  uint32_t norder = htonl(kCurrentTimeExternalSecs);
   valid_nonce.assign(reinterpret_cast<const char*>(&norder), sizeof(norder));
   valid_nonce.append(string(reinterpret_cast<const char*>(kOrbit), kOrbitSize));
   valid_nonce.append(string(20, '\x17'));  // 20 'random' bytes.
 
   {
     // Validation fails if you remove a byte from the nonce.
     bool called = false;
     bool is_valid = false;
     InsertStatus nonce_error = NONCE_UNKNOWN_FAILURE;
     string short_nonce = valid_nonce.substr(0, valid_nonce.length() - 1);
@@ skipping 30 matching lines @@
         new RecordResultCallback(&called, &is_valid, &nonce_error));
     EXPECT_TRUE(called);
     EXPECT_TRUE(is_valid);
     EXPECT_EQ(NONCE_OK, nonce_error);
   }
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net