Switch to standard integer types in rlz/.

rlz/test/rlz_test_helpers.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.
 //
 // Main entry point for all unit tests.
 
 #include "rlz_test_helpers.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <map>
 #include <vector>
 
 #include "base/strings/string16.h"
+#include "build/build_config.h"
 #include "rlz/lib/rlz_lib.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_WIN)
 #include <shlwapi.h>
 #include "base/win/registry.h"
 #include "base/win/windows_version.h"
 #elif defined(OS_POSIX)
 #include "base/files/file_path.h"
 #include "rlz/lib/rlz_value_store.h"
 #endif
 
 #if defined(OS_WIN)
 
 namespace {
 
 // Path to recursively copy into the replacemment hives.  These are needed
 // to make sure certain win32 APIs continue to run correctly once the real
 // hives are replaced.
 const wchar_t kHKLMAccessProviders[] =
     L"System\\CurrentControlSet\\Control\\Lsa\\AccessProviders";
 
 struct RegistryValue {
   base::string16 name;
   DWORD type;
-  std::vector<uint8> data;
+  std::vector<uint8_t> data;
 };
 
 struct RegistryKeyData {
   std::vector<RegistryValue> values;
   std::map<base::string16, RegistryKeyData> keys;
 };
 
 void ReadRegistryTree(const base::win::RegKey& src, RegistryKeyData* data) {
   // First read values.
   {
     base::win::RegistryValueIterator i(src.Handle(), L"");
     data->values.clear();
     data->values.reserve(i.ValueCount());
     for (; i.Valid(); ++i) {
       RegistryValue& value = *data->values.insert(data->values.end(),
                                                   RegistryValue());
-      const uint8* data = reinterpret_cast<const uint8*>(i.Value());
+      const uint8_t* data = reinterpret_cast<const uint8_t*>(i.Value());
       value.name.assign(i.Name());
       value.type = i.Type();
       value.data.assign(data, data + i.ValueSize());
     }
   }
 
   // Next read subkeys recursively.
   for (base::win::RegistryKeyIterator i(src.Handle(), L"");
        i.Valid(); ++i) {
     ReadRegistryTree(base::win::RegKey(src.Handle(), i.Name(), KEY_READ),
@@ skipping 84 matching lines @@
 void RlzLibTestNoMachineState::TearDown() {
   m_rlz_test_helper_.TearDown();
 }
 
 void RlzLibTestBase::SetUp() {
   RlzLibTestNoMachineState::SetUp();
 #if defined(OS_WIN)
   rlz_lib::CreateMachineState();
 #endif  // defined(OS_WIN)
 }