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

components/nacl/browser/nacl_browser.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 "components/nacl/browser/nacl_browser.h"
 
+#include <stddef.h>
+
 #include "base/command_line.h"
 #include "base/files/file_proxy.h"
 #include "base/files/file_util.h"
 #include "base/location.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/path_service.h"
 #include "base/pickle.h"
 #include "base/rand_util.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
@@ skipping 87 matching lines @@
 }
 
 void LogCacheSet(nacl::NaClBrowser::ValidationCacheStatus status) {
   // Bucket zero is reserved for future use.
   UMA_HISTOGRAM_ENUMERATION("NaCl.ValidationCache.Set", status,
                             nacl::NaClBrowser::CACHE_MAX);
 }
 
 // Crash throttling parameters.
 const size_t kMaxCrashesPerInterval = 3;
-const int64 kCrashesIntervalInSeconds = 120;
+const int64_t kCrashesIntervalInSeconds = 120;
 
 }  // namespace
 
 namespace nacl {
 
 base::File OpenNaClReadExecImpl(const base::FilePath& file_path,
                                 bool is_executable) {
   // Get a file descriptor. On Windows, we need 'GENERIC_EXECUTE' in order to
   // memory map the executable.
   // IMPORTANT: This file descriptor must not have write access - that could
   // allow a NaCl inner sandbox escape.
-  uint32 flags = base::File::FLAG_OPEN | base::File::FLAG_READ;
+  uint32_t flags = base::File::FLAG_OPEN | base::File::FLAG_READ;
   if (is_executable)
     flags |= base::File::FLAG_EXECUTE;  // Windows only flag.
   base::File file(file_path, flags);
   if (!file.IsValid())
     return file.Pass();
 
   // Check that the file does not reference a directory. Returning a descriptor
   // to an extension directory could allow an outer sandbox escape. openat(...)
   // could be used to traverse into the file system.
   base::File::Info file_info;
@@ skipping 260 matching lines @@
 void NaClBrowser::WaitForResources(const base::Closure& reply) {
   waiting_.push_back(reply);
   EnsureAllResourcesAvailable();
   CheckWaiting();
 }
 
 const base::FilePath& NaClBrowser::GetIrtFilePath() {
   return irt_filepath_;
 }
 
-void NaClBrowser::PutFilePath(const base::FilePath& path, uint64* file_token_lo,
-                              uint64* file_token_hi) {
+void NaClBrowser::PutFilePath(const base::FilePath& path,
+                              uint64_t* file_token_lo,
+                              uint64_t* file_token_hi) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   while (true) {
-    uint64 file_token[2] = {base::RandUint64(), base::RandUint64()};
+    uint64_t file_token[2] = {base::RandUint64(), base::RandUint64()};
     // A zero file_token indicates there is no file_token, if we get zero, ask
     // for another number.
     if (file_token[0] != 0 || file_token[1] != 0) {
       // If the file_token is in use, ask for another number.
       std::string key(reinterpret_cast<char*>(file_token), sizeof(file_token));
       PathCacheType::iterator iter = path_cache_.Peek(key);
       if (iter == path_cache_.end()) {
         path_cache_.Put(key, path);
         *file_token_lo = file_token[0];
         *file_token_hi = file_token[1];
         break;
       }
     }
   }
 }
 
-bool NaClBrowser::GetFilePath(uint64 file_token_lo, uint64 file_token_hi,
+bool NaClBrowser::GetFilePath(uint64_t file_token_lo,
+                              uint64_t file_token_hi,
                               base::FilePath* path) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-  uint64 file_token[2] = {file_token_lo, file_token_hi};
+  uint64_t file_token[2] = {file_token_lo, file_token_hi};
   std::string key(reinterpret_cast<char*>(file_token), sizeof(file_token));
   PathCacheType::iterator iter = path_cache_.Peek(key);
   if (iter == path_cache_.end()) {
     *path = base::FilePath(FILE_PATH_LITERAL(""));
     return false;
   }
   *path = iter->second;
   path_cache_.Erase(iter);
   return true;
 }
@@ skipping 119 matching lines @@
 bool NaClBrowser::IsThrottled() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   if (crash_times_.size() != kMaxCrashesPerInterval) {
     return false;
   }
   base::TimeDelta delta = base::Time::Now() - crash_times_.front();
   return delta.InSeconds() <= kCrashesIntervalInSeconds;
 }
 
 }  // namespace nacl