Switch to standard integer types in content/browser/.

content/browser/download/download_item_impl.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_DOWNLOAD_ITEM_IMPL_H_
 #define CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_ITEM_IMPL_H_
 
+#include <stdint.h>
+
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/files/file_path.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/time/time.h"
 #include "content/browser/download/download_net_log_parameters.h"
 #include "content/browser/download/download_request_handle.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/download_destination_observer.h"
 #include "content/public/browser/download_interrupt_reasons.h"
 #include "content/public/browser/download_item.h"
@@ skipping 20 matching lines @@
   // The maximum number of attempts we will make to resume automatically.
   static const int kMaxAutoResumeAttempts;
 
   // Note that it is the responsibility of the caller to ensure that a
   // DownloadItemImplDelegate passed to a DownloadItemImpl constructor
   // outlives the DownloadItemImpl.
 
   // Constructing from persistent store:
   // |bound_net_log| is constructed externally for our use.
   DownloadItemImpl(DownloadItemImplDelegate* delegate,
-                   uint32 id,
+                   uint32_t id,
                    const base::FilePath& current_path,
                    const base::FilePath& target_path,
                    const std::vector<GURL>& url_chain,
                    const GURL& referrer_url,
                    const std::string& mime_type,
                    const std::string& original_mime_type,
                    const base::Time& start_time,
                    const base::Time& end_time,
                    const std::string& etag,
                    const std::string& last_modified,
-                   int64 received_bytes,
-                   int64 total_bytes,
+                   int64_t received_bytes,
+                   int64_t total_bytes,
                    DownloadItem::DownloadState state,
                    DownloadDangerType danger_type,
                    DownloadInterruptReason interrupt_reason,
                    bool opened,
                    const net::BoundNetLog& bound_net_log);
 
   // Constructing for a regular download.
   // |bound_net_log| is constructed externally for our use.
   DownloadItemImpl(DownloadItemImplDelegate* delegate,
-                   uint32 id,
+                   uint32_t id,
                    const DownloadCreateInfo& info,
                    const net::BoundNetLog& bound_net_log);
 
   // Constructing for the "Save Page As..." feature:
   // |bound_net_log| is constructed externally for our use.
   DownloadItemImpl(DownloadItemImplDelegate* delegate,
-                   uint32 id,
+                   uint32_t id,
                    const base::FilePath& path,
                    const GURL& url,
                    const std::string& mime_type,
                    scoped_ptr<DownloadRequestHandleInterface> request_handle,
                    const net::BoundNetLog& bound_net_log);
 
   ~DownloadItemImpl() override;
 
   // DownloadItem
   void AddObserver(DownloadItem::Observer* observer) override;
   void RemoveObserver(DownloadItem::Observer* observer) override;
   void UpdateObservers() override;
   void ValidateDangerousDownload() override;
   void StealDangerousDownload(const AcquireFileCallback& callback) override;
   void Pause() override;
   void Resume() override;
   void Cancel(bool user_cancel) override;
   void Remove() override;
   void OpenDownload() override;
   void ShowDownloadInShell() override;
-  uint32 GetId() const override;
+  uint32_t GetId() const override;
   DownloadState GetState() const override;
   DownloadInterruptReason GetLastReason() const override;
   bool IsPaused() const override;
   bool IsTemporary() const override;
   bool CanResume() const override;
   bool IsDone() const override;
   const GURL& GetURL() const override;
   const std::vector<GURL>& GetUrlChain() const override;
   const GURL& GetOriginalUrl() const override;
   const GURL& GetReferrerUrl() const override;
@@ skipping 14 matching lines @@
   const base::FilePath& GetForcedFilePath() const override;
   base::FilePath GetFileNameToReportUser() const override;
   TargetDisposition GetTargetDisposition() const override;
   const std::string& GetHash() const override;
   const std::string& GetHashState() const override;
   bool GetFileExternallyRemoved() const override;
   void DeleteFile(const base::Callback<void(bool)>& callback) override;
   bool IsDangerous() const override;
   DownloadDangerType GetDangerType() const override;
   bool TimeRemaining(base::TimeDelta* remaining) const override;
-  int64 CurrentSpeed() const override;
+  int64_t CurrentSpeed() const override;
   int PercentComplete() const override;
   bool AllDataSaved() const override;
-  int64 GetTotalBytes() const override;
-  int64 GetReceivedBytes() const override;
+  int64_t GetTotalBytes() const override;
+  int64_t GetReceivedBytes() const override;
   base::Time GetStartTime() const override;
   base::Time GetEndTime() const override;
   bool CanShowInFolder() override;
   bool CanOpenDownload() override;
   bool ShouldOpenFileBasedOnExtension() override;
   bool GetOpenWhenComplete() const override;
   bool GetAutoOpened() override;
   bool GetOpened() const override;
   BrowserContext* GetBrowserContext() const override;
   WebContents* GetWebContents() const override;
@@ skipping 39 matching lines @@
   // for use by download destinations.
   virtual base::WeakPtr<DownloadDestinationObserver>
       DestinationObserverAsWeakPtr();
 
   // Get the download's BoundNetLog.
   virtual const net::BoundNetLog& GetBoundNetLog() const;
 
   // DownloadItemImpl routines only needed by SavePackage ----------------------
 
   // Called by SavePackage to set the total number of bytes on the item.
-  virtual void SetTotalBytes(int64 total_bytes);
+  virtual void SetTotalBytes(int64_t total_bytes);
 
   virtual void OnAllDataSaved(const std::string& final_hash);
 
   // Called by SavePackage to display progress when the DownloadItem
   // should be considered complete.
   virtual void MarkAsComplete();
 
   // DownloadDestinationObserver
-  void DestinationUpdate(int64 bytes_so_far,
-                         int64 bytes_per_sec,
+  void DestinationUpdate(int64_t bytes_so_far,
+                         int64_t bytes_per_sec,
                          const std::string& hash_state) override;
   void DestinationError(DownloadInterruptReason reason) override;
   void DestinationCompleted(const std::string& final_hash) override;
 
  private:
   // Fine grained states of a download. Note that active downloads are created
   // in IN_PROGRESS_INTERNAL state. However, downloads creates via history can
   // be created in COMPLETE_INTERNAL, CANCELLED_INTERNAL and
   // INTERRUPTED_INTERNAL.
 
@@ skipping 163 matching lines @@
   static const char* DebugResumeModeString(ResumeMode mode);
 
   // Will be false for save package downloads retrieved from the history.
   // TODO(rdsmith): Replace with a generalized enum for "download source".
   const bool is_save_package_download_;
 
   // The handle to the request information.  Used for operations outside the
   // download system.
   scoped_ptr<DownloadRequestHandleInterface> request_handle_;
 
-  uint32 download_id_;
+  uint32_t download_id_;
 
   // Display name for the download. If this is empty, then the display name is
   // considered to be |target_path_.BaseName()|.
   base::FilePath display_name_;
 
   // Full path to the downloaded or downloading file. This is the path to the
   // physical file, if one exists. The final target path is specified by
   // |target_path_|. |current_path_| can be empty if the in-progress path hasn't
   // been determined.
   base::FilePath current_path_;
@@ skipping 43 matching lines @@
   // The value of the content type header sent with the downloaded item.  It
   // may be different from |mime_type_|, which may be set based on heuristics
   // which may look at the file extension and first few bytes of the file.
   std::string original_mime_type_;
 
   // The remote IP address where the download was fetched from.  Copied from
   // DownloadCreateInfo::remote_address.
   std::string remote_address_;
 
   // Total bytes expected.
-  int64 total_bytes_;
+  int64_t total_bytes_;
 
   // Current received bytes.
-  int64 received_bytes_;
+  int64_t received_bytes_;
 
   // Current speed. Calculated by the DownloadFile.
-  int64 bytes_per_sec_;
+  int64_t bytes_per_sec_;
 
   // Sha256 hash of the content.  This might be empty either because
   // the download isn't done yet or because the hash isn't needed
   // (ChromeDownloadManagerDelegate::GenerateFileHash() returned false).
   std::string hash_;
 
   // A blob containing the state of the hash algorithm.  Only valid while the
   // download is in progress.
   std::string hash_state_;
 
@@ skipping 74 matching lines @@
   const net::BoundNetLog bound_net_log_;
 
   base::WeakPtrFactory<DownloadItemImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadItemImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_ITEM_IMPL_H_