Switch to standard integer types in rlz/.

rlz/lib/financial_ping.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.
 //
 // Library functions related to the Financial Server ping.
 
 #include "rlz/lib/financial_ping.h"
 
+#include <stdint.h>
+
 #include "base/atomicops.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "rlz/lib/assert.h"
 #include "rlz/lib/lib_values.h"
 #include "rlz/lib/machine_id.h"
 #include "rlz/lib/rlz_lib.h"
 #include "rlz/lib/rlz_value_store.h"
 #include "rlz/lib/string_utils.h"
 
 #if !defined(OS_WIN)
 #include "base/time/time.h"
 #endif
@@ skipping 31 matching lines @@
 #include "net/url_request/url_request_context_getter.h"
 #include "url/gurl.h"
 
 #endif
 
 namespace {
 
 // Returns the time relative to a fixed point in the past in multiples of
 // 100 ns stepts. The point in the past is arbitrary but can't change, as the
 // result of this value is stored on disk.
-int64 GetSystemTimeAsInt64() {
+int64_t GetSystemTimeAsInt64() {
 #if defined(OS_WIN)
   FILETIME now_as_file_time;
   // Relative to Jan 1, 1601 (UTC).
   GetSystemTimeAsFileTime(&now_as_file_time);
 
   LARGE_INTEGER integer;
   integer.HighPart = now_as_file_time.dwHighDateTime;
   integer.LowPart = now_as_file_time.dwLowDateTime;
   return integer.QuadPart;
 #else
   // Seconds since epoch (Jan 1, 1970).
   double now_seconds = base::Time::Now().ToDoubleT();
-  return static_cast<int64>(now_seconds * 1000 * 1000 * 10);
+  return static_cast<int64_t>(now_seconds * 1000 * 1000 * 10);
 #endif
 }
 
 }  // namespace
 
 
 namespace rlz_lib {
 
 using base::subtle::AtomicWord;
 
@@ skipping 256 matching lines @@
   return fetcher->GetResponseAsString(response);
 #endif
 }
 
 bool FinancialPing::IsPingTime(Product product, bool no_delay) {
   ScopedRlzValueStoreLock lock;
   RlzValueStore* store = lock.GetStore();
   if (!store || !store->HasAccess(RlzValueStore::kReadAccess))
     return false;
 
-  int64 last_ping = 0;
+  int64_t last_ping = 0;
   if (!store->ReadPingTime(product, &last_ping))
     return true;
 
-  uint64 now = GetSystemTimeAsInt64();
-  int64 interval = now - last_ping;
+  uint64_t now = GetSystemTimeAsInt64();
+  int64_t interval = now - last_ping;
 
   // If interval is negative, clock was probably reset. So ping.
   if (interval < 0)
     return true;
 
   // Check if this product has any unreported events.
   char cgi[kMaxCgiLength + 1];
   cgi[0] = 0;
   bool has_events = GetProductEventsAsCgi(product, cgi, arraysize(cgi));
   if (no_delay && has_events)
     return true;
 
   return interval >= (has_events ? kEventsPingInterval : kNoEventsPingInterval);
 }
 
 
 bool FinancialPing::UpdateLastPingTime(Product product) {
   ScopedRlzValueStoreLock lock;
   RlzValueStore* store = lock.GetStore();
   if (!store || !store->HasAccess(RlzValueStore::kWriteAccess))
     return false;
 
-  uint64 now = GetSystemTimeAsInt64();
+  uint64_t now = GetSystemTimeAsInt64();
   return store->WritePingTime(product, now);
 }
 
 
 bool FinancialPing::ClearLastPingTime(Product product) {
   ScopedRlzValueStoreLock lock;
   RlzValueStore* store = lock.GetStore();
   if (!store || !store->HasAccess(RlzValueStore::kWriteAccess))
     return false;
   return store->ClearPingTime(product);
 }
 
 #if defined(RLZ_NETWORK_IMPLEMENTATION_CHROME_NET)
 namespace test {
 
 void ResetSendFinancialPingInterrupted() {
   send_financial_ping_interrupted_for_test = false;
 }
 
 bool WasSendFinancialPingInterrupted() {
   return send_financial_ping_interrupted_for_test;
 }
 
 }  // namespace test
 #endif
 
 }  // namespace rlz_lib