Switch to standard integer types in content/browser/.

content/browser/download/base_file.h

 // 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.
 
 #ifndef CONTENT_BROWSER_DOWNLOAD_BASE_FILE_H_
 #define CONTENT_BROWSER_DOWNLOAD_BASE_FILE_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <string>
 
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/download_interrupt_reasons.h"
 #include "crypto/sha2.h"
 #include "net/base/net_errors.h"
 #include "net/log/net_log.h"
 #include "url/gurl.h"
 
 namespace crypto {
 class SecureHash;
 }
 
 namespace content {
 
 // File being downloaded and saved to disk. This is a base class
 // for DownloadFile and SaveFile, which keep more state information.
 class CONTENT_EXPORT BaseFile {
  public:
   // May be constructed on any thread.  All other routines (including
   // destruction) must occur on the FILE thread.
   BaseFile(const base::FilePath& full_path,
            const GURL& source_url,
            const GURL& referrer_url,
-           int64 received_bytes,
+           int64_t received_bytes,
            bool calculate_hash,
            const std::string& hash_state,
            base::File file,
            const net::BoundNetLog& bound_net_log);
   virtual ~BaseFile();
 
   // Returns DOWNLOAD_INTERRUPT_REASON_NONE on success, or a
   // DownloadInterruptReason on failure.  |default_directory| specifies the
   // directory to create the temporary file in if |full_path()| is empty. If
   // |default_directory| and |full_path()| are empty, then a temporary file will
@@ skipping 34 matching lines @@
 
   // Returns the last known path to the download file. Can be empty if there's
   // no file.
   const base::FilePath& full_path() const { return full_path_; }
 
   // Returns true if the file is open. If true, the file can be written to or
   // renamed.
   bool in_progress() const { return file_.IsValid(); }
 
   // Returns the number of bytes in the file pointed to by full_path().
-  int64 bytes_so_far() const { return bytes_so_far_; }
+  int64_t bytes_so_far() const { return bytes_so_far_; }
 
   // Fills |hash| with the hash digest for the file.
   // Returns true if digest is successfully calculated.
   virtual bool GetHash(std::string* hash);
 
   // Returns the current (intermediate) state of the hash as a byte string.
   virtual std::string GetHashState();
 
   // Returns true if the given hash is considered empty.  An empty hash is
   // a string of size crypto::kSHA256Length that contains only zeros (initial
@@ skipping 15 matching lines @@
   // Resets file_.
   void ClearFile();
 
   // Platform specific method that moves a file to a new path and adjusts the
   // security descriptor / permissions on the file to match the defaults for the
   // new directory.
   DownloadInterruptReason MoveFileAndAdjustPermissions(
       const base::FilePath& new_path);
 
   // Split out from CurrentSpeed to enable testing.
-  int64 CurrentSpeedAtTime(base::TimeTicks current_time) const;
+  int64_t CurrentSpeedAtTime(base::TimeTicks current_time) const;
 
   // Log a TYPE_DOWNLOAD_FILE_ERROR NetLog event with |error| and passes error
   // on through, converting to a |DownloadInterruptReason|.
   DownloadInterruptReason LogNetError(const char* operation, net::Error error);
 
   // Log the system error in |os_error| and converts it into a
   // |DownloadInterruptReason|.
   DownloadInterruptReason LogSystemError(const char* operation,
                                          logging::SystemErrorCode os_error);
 
@@ skipping 13 matching lines @@
 
   // The URL where the download was initiated.
   GURL referrer_url_;
 
   std::string client_guid_;
 
   // OS file for writing
   base::File file_;
 
   // Amount of data received up so far, in bytes.
-  int64 bytes_so_far_;
+  int64_t bytes_so_far_;
 
   // Start time for calculating speed.
   base::TimeTicks start_tick_;
 
   // Indicates if hash should be calculated for the file.
   bool calculate_hash_;
 
   // Used to calculate hash for the file when calculate_hash_
   // is set.
   scoped_ptr<crypto::SecureHash> secure_hash_;
 
   unsigned char sha256_hash_[crypto::kSHA256Length];
 
   // Indicates that this class no longer owns the associated file, and so
   // won't delete it on destruction.
   bool detached_;
 
   net::BoundNetLog bound_net_log_;
 
   DISALLOW_COPY_AND_ASSIGN(BaseFile);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_DOWNLOAD_BASE_FILE_H_