Switch to standard integer types in content/browser/.

content/browser/download/mhtml_generation_manager.cc

Index: content/browser/download/mhtml_generation_manager.cc
diff --git a/content/browser/download/mhtml_generation_manager.cc b/content/browser/download/mhtml_generation_manager.cc
index 26411f7d5b54520b02ee22172b84956d7b169233..6c14c3be62a3f65b0444cfcc32965a21a617fb55 100644
--- a/content/browser/download/mhtml_generation_manager.cc
+++ b/content/browser/download/mhtml_generation_manager.cc
@@ -10,6 +10,7 @@
 #include "base/bind.h"
 #include "base/files/file.h"
 #include "base/guid.h"
+#include "base/macros.h"
 #include "base/rand_util.h"
 #include "base/scoped_observer.h"
 #include "base/stl_util.h"
@@ -48,7 +49,7 @@ class MHTMLGenerationManager::Job : public RenderProcessHostObserver {
 
   // Close the file on the file thread and respond back on the UI thread with
   // file size.
-  void CloseFile(base::Callback<void(int64 file_size)> callback);
+  void CloseFile(base::Callback<void(int64_t file_size)> callback);
 
   // RenderProcessHostObserver:
   void RenderProcessExited(RenderProcessHost* host,
@@ -58,7 +59,7 @@ class MHTMLGenerationManager::Job : public RenderProcessHostObserver {
 
  private:
   static std::string GenerateMHTMLBoundaryMarker();
-  static int64 CloseFileOnFileThread(base::File file);
+  static int64_t CloseFileOnFileThread(base::File file);
   void AddFrame(RenderFrameHost* render_frame_host);
 
   // Creates a new map with values (content ids) the same as in
@@ -190,7 +191,7 @@ void MHTMLGenerationManager::Job::RenderProcessHostDestroyed(
 }
 
 void MHTMLGenerationManager::Job::CloseFile(
-    base::Callback<void(int64)> callback) {
+    base::Callback<void(int64_t)> callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   if (!browser_file_.IsValid()) {
@@ -206,10 +207,10 @@ void MHTMLGenerationManager::Job::CloseFile(
 }
 
 // static
-int64 MHTMLGenerationManager::Job::CloseFileOnFileThread(base::File file) {
+int64_t MHTMLGenerationManager::Job::CloseFileOnFileThread(base::File file) {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
   DCHECK(file.IsValid());
-  int64 file_size = file.GetLength();
+  int64_t file_size = file.GetLength();
   file.Close();
   return file_size;
 }
@@ -292,7 +293,7 @@ base::File MHTMLGenerationManager::CreateFile(const base::FilePath& file_path) {
   // only allow writing to the file and forbid reading from the file (as this
   // would allow reading content generated by other renderers / other web
   // principals).
-  uint32 file_flags = base::File::FLAG_CREATE_ALWAYS | base::File::FLAG_WRITE;
+  uint32_t file_flags = base::File::FLAG_CREATE_ALWAYS | base::File::FLAG_WRITE;
 
   base::File browser_file(file_path, file_flags);
   if (!browser_file.IsValid()) {
@@ -338,7 +339,7 @@ void MHTMLGenerationManager::JobFinished(int job_id, JobStatus job_status) {
 
 void MHTMLGenerationManager::OnFileClosed(int job_id,
                                           JobStatus job_status,
-                                          int64 file_size) {
+                                          int64_t file_size) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   Job* job = FindJob(job_id);