4 files changed, 13 insertions, 7 deletions
diff --git a/chromium/base/debug/alias.h b/chromium/base/debug/alias.h
index cdd2372ea87..bd0904e5ab7 100644
--- a/chromium/base/debug/alias.h
+++ b/chromium/base/debug/alias.h
@@ -19,12 +19,15 @@ namespace debug {
 // otherwise be live at the point of a potential crash. This can only be done
 // with local variables, not globals, object members, or function return values
 // - these must be copied to locals if you want to ensure they are recorded in
-// crash dumps. Note that if the local variable is a pointer then its value will
-// be retained but the memory that it points to will probably not be saved in
-// the crash dump - by default only stack memory is saved. Therefore the
-// aliasing technique is usually only worthwhile with non-pointer variables. If
-// you have a pointer to an object and you want to retain the object's state you
-// need to copy the object or its fields to local variables.
+// crash dumps. Function arguments are fine to use since the
+// base::debug::Alias() call on them will make sure they are copied to the stack
+// even if they were passed in a register. Note that if the local variable is a
+// pointer then its value will be retained but the memory that it points to will
+// probably not be saved in the crash dump - by default only stack memory is
+// saved. Therefore the aliasing technique is usually only worthwhile with
+// non-pointer variables. If you have a pointer to an object and you want to
+// retain the object's state you need to copy the object or its fields to local
+// variables.
 //
 // Example usage:
 //   int last_error = err_;
diff --git a/chromium/base/debug/debugger_posix.cc b/chromium/base/debug/debugger_posix.cc
index de383b80821..4636a1ea9b9 100644
--- a/chromium/base/debug/debugger_posix.cc
+++ b/chromium/base/debug/debugger_posix.cc
@@ -49,11 +49,11 @@
 
 #include <ostream>
 
+#include "base/check.h"
 #include "base/debug/alias.h"
 #include "base/debug/debugging_buildflags.h"
 #include "base/environment.h"
 #include "base/files/file_util.h"
-#include "base/logging.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/process/process.h"
 #include "base/strings/string_number_conversions.h"
diff --git a/chromium/base/debug/dump_without_crashing.cc b/chromium/base/debug/dump_without_crashing.cc
index 3e2fa17ca68..4aa94a15d80 100644
--- a/chromium/base/debug/dump_without_crashing.cc
+++ b/chromium/base/debug/dump_without_crashing.cc
@@ -5,6 +5,7 @@
 #include "base/debug/dump_without_crashing.h"
 
 #include "base/check.h"
+#include "base/trace_event/base_tracing.h"
 
 namespace {
 
@@ -19,6 +20,7 @@ namespace base {
 namespace debug {
 
 bool DumpWithoutCrashing() {
+  TRACE_EVENT0("base", "DumpWithoutCrashing");
   if (dump_without_crashing_function_) {
     (*dump_without_crashing_function_)();
     return true;
diff --git a/chromium/base/debug/leak_tracker.h b/chromium/base/debug/leak_tracker.h
index 7ddd5b62d1a..7013264101a 100644
--- a/chromium/base/debug/leak_tracker.h
+++ b/chromium/base/debug/leak_tracker.h
@@ -15,6 +15,7 @@
 #endif
 
 #ifdef ENABLE_LEAK_TRACKER
+#include "base/check_op.h"
 #include "base/containers/linked_list.h"
 #include "base/debug/stack_trace.h"
 #include "base/logging.h"