Switch to standard integer types in content/browser/.

content/browser/download/download_net_log_parameters.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/download_net_log_parameters.h"
 
-#include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 #include "content/public/browser/download_interrupt_reasons.h"
 #include "net/base/net_errors.h"
 #include "url/gurl.h"
 
 namespace content {
 
 namespace {
 
@@ skipping 59 matching lines @@
   scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
 
   dict->SetString("old_filename", old_filename->AsUTF8Unsafe());
   dict->SetString("new_filename", new_filename->AsUTF8Unsafe());
 
   return dict.Pass();
 }
 
 scoped_ptr<base::Value> ItemInterruptedNetLogCallback(
     DownloadInterruptReason reason,
-    int64 bytes_so_far,
+    int64_t bytes_so_far,
     const std::string* hash_state,
     net::NetLogCaptureMode capture_mode) {
   scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
 
   dict->SetString("interrupt_reason", DownloadInterruptReasonToString(reason));
   dict->SetString("bytes_so_far", base::Int64ToString(bytes_so_far));
   dict->SetString("hash_state",
                   base::HexEncode(hash_state->data(), hash_state->size()));
 
   return dict.Pass();
 }
 
 scoped_ptr<base::Value> ItemResumingNetLogCallback(
     bool user_initiated,
     DownloadInterruptReason reason,
-    int64 bytes_so_far,
+    int64_t bytes_so_far,
     const std::string* hash_state,
     net::NetLogCaptureMode capture_mode) {
   scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
 
   dict->SetString("user_initiated", user_initiated ? "true" : "false");
   dict->SetString("interrupt_reason", DownloadInterruptReasonToString(reason));
   dict->SetString("bytes_so_far", base::Int64ToString(bytes_so_far));
   dict->SetString("hash_state",
                   base::HexEncode(hash_state->data(), hash_state->size()));
 
   return dict.Pass();
 }
 
 scoped_ptr<base::Value> ItemCompletingNetLogCallback(
-    int64 bytes_so_far,
+    int64_t bytes_so_far,
     const std::string* final_hash,
     net::NetLogCaptureMode capture_mode) {
   scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
 
   dict->SetString("bytes_so_far", base::Int64ToString(bytes_so_far));
   dict->SetString("final_hash",
                   base::HexEncode(final_hash->data(), final_hash->size()));
 
   return dict.Pass();
 }
 
 scoped_ptr<base::Value> ItemFinishedNetLogCallback(
     bool auto_opened,
     net::NetLogCaptureMode capture_mode) {
   scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
 
   dict->SetString("auto_opened", auto_opened ? "yes" : "no");
 
   return dict.Pass();
 }
 
 scoped_ptr<base::Value> ItemCanceledNetLogCallback(
-    int64 bytes_so_far,
+    int64_t bytes_so_far,
     const std::string* hash_state,
     net::NetLogCaptureMode capture_mode) {
   scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
 
   dict->SetString("bytes_so_far", base::Int64ToString(bytes_so_far));
   dict->SetString("hash_state",
                   base::HexEncode(hash_state->data(), hash_state->size()));
 
   return dict.Pass();
 }
 
 scoped_ptr<base::Value> FileOpenedNetLogCallback(
     const base::FilePath* file_name,
-    int64 start_offset,
+    int64_t start_offset,
     net::NetLogCaptureMode capture_mode) {
   scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
 
   dict->SetString("file_name", file_name->AsUTF8Unsafe());
   dict->SetString("start_offset", base::Int64ToString(start_offset));
 
   return dict.Pass();
 }
 
 scoped_ptr<base::Value> FileStreamDrainedNetLogCallback(
@@ skipping 41 matching lines @@
 
   dict->SetString("operation", operation);
   if (os_error != 0)
     dict->SetInteger("os_error", os_error);
   dict->SetString("interrupt_reason", DownloadInterruptReasonToString(reason));
 
   return dict.Pass();
 }
 
 }  // namespace content