Switch to standard integer types in rlz/.

rlz/win/lib/rlz_value_store_registry.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 "rlz/win/lib/rlz_value_store_registry.h"
 
+#include "base/macros.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/registry.h"
 #include "rlz/lib/assert.h"
 #include "rlz/lib/lib_values.h"
 #include "rlz/lib/rlz_lib.h"
 #include "rlz/lib/string_utils.h"
 #include "rlz/win/lib/registry_util.h"
 
 using base::ASCIIToUTF16;
@@ skipping 137 matching lines @@
 
 // static
 std::wstring RlzValueStoreRegistry::GetWideLibKeyName() {
   return ASCIIToUTF16(kLibKeyName);
 }
 
 bool RlzValueStoreRegistry::HasAccess(AccessType type) {
   return HasUserKeyAccess(type == kWriteAccess);
 }
 
-bool RlzValueStoreRegistry::WritePingTime(Product product, int64 time) {
+bool RlzValueStoreRegistry::WritePingTime(Product product, int64_t time) {
   base::win::RegKey key;
   std::wstring product_name = GetWideProductName(product);
   return GetPingTimesRegKey(KEY_WRITE, &key) &&
       key.WriteValue(product_name.c_str(), &time, sizeof(time),
                      REG_QWORD) == ERROR_SUCCESS;
 }
 
-bool RlzValueStoreRegistry::ReadPingTime(Product product, int64* time) {
+bool RlzValueStoreRegistry::ReadPingTime(Product product, int64_t* time) {
   base::win::RegKey key;
   std::wstring product_name = GetWideProductName(product);
   return GetPingTimesRegKey(KEY_READ, &key) &&
       key.ReadInt64(product_name.c_str(), time) == ERROR_SUCCESS;
 }
 
 bool RlzValueStoreRegistry::ClearPingTime(Product product) {
   base::win::RegKey key;
   GetPingTimesRegKey(KEY_WRITE, &key);
 
   std::wstring product_name = GetWideProductName(product);
   key.DeleteValue(product_name.c_str());
 
   // Verify deletion.
-  uint64 value;
+  uint64_t value;
   DWORD size = sizeof(value);
   if (key.ReadValue(
         product_name.c_str(), &value, &size, NULL) == ERROR_SUCCESS) {
     ASSERT_STRING("RlzValueStoreRegistry::ClearPingTime: Failed to delete.");
     return false;
   }
 
   return true;
 }
 
@@ skipping 172 matching lines @@
 }
 
 ScopedRlzValueStoreLock::~ScopedRlzValueStoreLock() {
 }
 
 RlzValueStore* ScopedRlzValueStoreLock::GetStore() {
   return store_.get();
 }
 
 }  // namespace rlz_lib