Switch to standard integer types in components/, part 3 of 4.

components/ownership/owner_key_util_impl_unittest.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 "components/ownership/owner_key_util_impl.h"
 
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace ownership {
 
 // 2048-bit RSA public key for testing.
-const uint8 kTestKeyData[] = {
+const uint8_t kTestKeyData[] = {
     0x30, 0x82, 0x01, 0x22, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86,
     0xf7, 0x0d, 0x01, 0x01, 0x01, 0x05, 0x00, 0x03, 0x82, 0x01, 0x0f, 0x00,
     0x30, 0x82, 0x01, 0x0a, 0x02, 0x82, 0x01, 0x01, 0x00, 0xe8, 0x39, 0x11,
     0xd0, 0x98, 0x52, 0x4f, 0xf7, 0x18, 0xd1, 0xbf, 0x98, 0x06, 0xae, 0x7a,
     0x7c, 0xd7, 0x6f, 0x02, 0x54, 0x37, 0x4e, 0xcd, 0xa6, 0x27, 0x8e, 0xf7,
     0x82, 0x1d, 0xde, 0x3d, 0xf5, 0x6b, 0xa4, 0xe5, 0x6b, 0x0c, 0xf0, 0x39,
     0xe5, 0xd9, 0x53, 0xe7, 0x6b, 0x6d, 0xa1, 0xc7, 0xdf, 0x92, 0xb7, 0xb0,
     0x14, 0x4d, 0x4e, 0x7d, 0x27, 0xd4, 0xf7, 0x35, 0xae, 0xc7, 0x3d, 0x13,
     0x74, 0x23, 0x8c, 0xda, 0xf1, 0x94, 0xbb, 0x2e, 0x06, 0x0d, 0x55, 0xe2,
     0x29, 0xf1, 0xfb, 0x4a, 0x2a, 0xb2, 0x40, 0x62, 0x59, 0x21, 0x39, 0xf9,
@@ skipping 28 matching lines @@
   base::ScopedTempDir tmpdir_;
   base::FilePath key_file_;
   scoped_refptr<OwnerKeyUtil> util_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(OwnerKeyUtilImplTest);
 };
 
 TEST_F(OwnerKeyUtilImplTest, ImportPublicKey) {
   // Export public key, so that we can compare it to the one we get off disk.
-  std::vector<uint8> public_key(kTestKeyData,
-                                kTestKeyData + sizeof(kTestKeyData));
+  std::vector<uint8_t> public_key(kTestKeyData,
+                                  kTestKeyData + sizeof(kTestKeyData));
   ASSERT_EQ(static_cast<int>(public_key.size()),
             base::WriteFile(key_file_,
                             reinterpret_cast<const char*>(public_key.data()),
                             public_key.size()));
   EXPECT_TRUE(util_->IsPublicKeyPresent());
 
-  std::vector<uint8> from_disk;
+  std::vector<uint8_t> from_disk;
   EXPECT_TRUE(util_->ImportPublicKey(&from_disk));
 
   EXPECT_EQ(public_key, from_disk);
 }
 
 TEST_F(OwnerKeyUtilImplTest, ImportPublicKeyFailed) {
   // First test the case where the file is missing which should fail.
   EXPECT_FALSE(util_->IsPublicKeyPresent());
-  std::vector<uint8> from_disk;
+  std::vector<uint8_t> from_disk;
   EXPECT_FALSE(util_->ImportPublicKey(&from_disk));
 
   // Next try empty file. This should fail and the array should be empty.
   from_disk.resize(10);
   ASSERT_EQ(0, base::WriteFile(key_file_, "", 0));
   EXPECT_TRUE(util_->IsPublicKeyPresent());
   EXPECT_FALSE(util_->ImportPublicKey(&from_disk));
   EXPECT_FALSE(from_disk.size());
 }
 
 }  // namespace ownership