Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1930)

Unified Diff: base/trace_event/process_memory_totals_dump_provider.cc

Issue 1546033002: Switch to standard integer types in base/trace_event/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: base/trace_event/process_memory_totals_dump_provider.cc
diff --git a/base/trace_event/process_memory_totals_dump_provider.cc b/base/trace_event/process_memory_totals_dump_provider.cc
index 83015f8e5098eb98c79adbcdd363a94d87a46758..1713ebf0bc99edd9b964bf66af8c2bfd8fd354b8 100644
--- a/base/trace_event/process_memory_totals_dump_provider.cc
+++ b/base/trace_event/process_memory_totals_dump_provider.cc
@@ -4,9 +4,12 @@
#include "base/trace_event/process_memory_totals_dump_provider.h"
+#include <stddef.h>
+
#include "base/process/process_metrics.h"
#include "base/trace_event/process_memory_dump.h"
#include "base/trace_event/process_memory_totals.h"
+#include "build/build_config.h"
#if defined(OS_LINUX) || defined(OS_ANDROID)
#include <fcntl.h>
@@ -23,7 +26,7 @@ namespace base {
namespace trace_event {
// static
-uint64 ProcessMemoryTotalsDumpProvider::rss_bytes_for_testing = 0;
+uint64_t ProcessMemoryTotalsDumpProvider::rss_bytes_for_testing = 0;
// static
ProcessMemoryTotalsDumpProvider*
@@ -43,11 +46,11 @@ ProcessMemoryTotalsDumpProvider::~ProcessMemoryTotalsDumpProvider() {
// the current process.
bool ProcessMemoryTotalsDumpProvider::OnMemoryDump(const MemoryDumpArgs& args,
ProcessMemoryDump* pmd) {
- const uint64 rss_bytes = rss_bytes_for_testing
- ? rss_bytes_for_testing
- : process_metrics_->GetWorkingSetSize();
+ const uint64_t rss_bytes = rss_bytes_for_testing
+ ? rss_bytes_for_testing
+ : process_metrics_->GetWorkingSetSize();
- uint64 peak_rss_bytes = 0;
+ uint64_t peak_rss_bytes = 0;
#if !defined(OS_IOS)
peak_rss_bytes = process_metrics_->GetPeakWorkingSetSize();

Powered by Google App Engine
This is Rietveld 408576698