Switch to standard integer types in content/browser/.

content/browser/download/mhtml_generation_manager.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.
 
 #include "content/browser/download/mhtml_generation_manager.h"
 
 #include <map>
 #include <queue>
 
 #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"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/common/frame_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
@@ skipping 18 matching lines @@
   // Returns true if the message was sent successfully; false otherwise.
   bool SendToNextRenderFrame();
 
   // Indicates if more calls to SendToNextRenderFrame are needed.
   bool HasMoreFramesToProcess() const {
     return !pending_frame_tree_node_ids_.empty();
   }
 
   // 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,
                            base::TerminationStatus status,
                            int exit_code) override;
   void RenderProcessHostDestroyed(RenderProcessHost* host) override;
 
  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
   // |frame_tree_node_to_content_id_| map, but with the keys translated from
   // frame_tree_node_id into a |site_instance|-specific routing_id.
   std::map<int, std::string> CreateFrameRoutingIdToContentId(
       SiteInstance* site_instance);
 
   // Id used to map renderer responses to jobs.
   // See also MHTMLGenerationManager::id_to_job_ map.
@@ skipping 111 matching lines @@
   frame_tree_node_to_content_id_[frame_tree_node_id] = content_id;
 }
 
 void MHTMLGenerationManager::Job::RenderProcessHostDestroyed(
     RenderProcessHost* host) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   observed_renderer_process_host_.Remove(host);
 }
 
 void MHTMLGenerationManager::Job::CloseFile(
-    base::Callback<void(int64)> callback) {
+    base::Callback<void(int64_t)> callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   if (!browser_file_.IsValid()) {
     callback.Run(-1);
     return;
   }
 
   BrowserThread::PostTaskAndReplyWithResult(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(&MHTMLGenerationManager::Job::CloseFileOnFileThread,
                  base::Passed(browser_file_.Pass())),
       callback);
 }
 
 // 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;
 }
 
 // static
 std::string MHTMLGenerationManager::Job::GenerateMHTMLBoundaryMarker() {
   // TODO(lukasza): Introduce and use a shared helper function in
   // net/base/mime_util.h instead of having the ad-hoc code below.
 
   // Trying to generate random boundaries similar to IE/UnMHT
@@ skipping 62 matching lines @@
 // static
 base::File MHTMLGenerationManager::CreateFile(const base::FilePath& file_path) {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
 
   // SECURITY NOTE: A file descriptor to the file created below will be passed
   // to multiple renderer processes which (in out-of-process iframes mode) can
   // act on behalf of separate web principals.  Therefore it is important to
   // 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()) {
     LOG(ERROR) << "Failed to create file to save MHTML at: " <<
         file_path.value();
   }
   return browser_file.Pass();
 }
 
 void MHTMLGenerationManager::OnFileAvailable(int job_id,
@@ skipping 25 matching lines @@
     return;
 
   job->CloseFile(
       base::Bind(&MHTMLGenerationManager::OnFileClosed,
                  base::Unretained(this),  // Safe b/c |this| is a singleton.
                  job_id, 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);
   if (!job)
     return;
 
   job->callback().Run(job_status == JobStatus::SUCCESS ? file_size : -1);
   id_to_job_.erase(job_id);
   delete job;
 }
@@ skipping 26 matching lines @@
        ++it) {
     if (it->second == job) {
       JobFinished(it->first, JobStatus::FAILURE);
       return;
     }
   }
   NOTREACHED();
 }
 
 }  // namespace content