Type change in StackSamplingProfiler from void* to uintptr_t.

content/browser/profiler_message_filter.h

Index: content/browser/profiler_message_filter.h
diff --git a/content/browser/profiler_message_filter.h b/content/browser/profiler_message_filter.h
index 875e45d0aa6c3d8a603b4f1816d83f822b34096a..64fd4b178f6099a9b9163ab1be4fb2e83f6d9cd5 100644
--- a/content/browser/profiler_message_filter.h
+++ b/content/browser/profiler_message_filter.h
@@ -7,6 +7,8 @@
 
 #include <string>
 
+#include "base/metrics/call_stack_profile_params.h"
+#include "base/profiler/stack_sampling_profiler.h"

[erikchen, 2015/08/31 21:17:28]

Should we forward declare the types we need and add the includes to the .cc
file?

[sydli, 2015/09/01 00:29:59]

Done. Couldn't forward declare CallStackProfiles, though.

 #include "content/public/browser/browser_message_filter.h"
 #include "content/public/common/process_type.h"
 
@@ -36,6 +38,12 @@ class ProfilerMessageFilter : public BrowserMessageFilter {
       int sequence_number,
       const tracked_objects::ProcessDataSnapshot& profiler_data);
 
+  // Handler for stack sampler data profiled on child thread.
+  void OnChildStackProfilerData(
+      const base::StackSamplingProfiler::CallStackProfiles& profiler_data,
+      const base::CallStackProfileParams& params,
+      base::TimeTicks start_timestamp);
+
 #if defined(USE_TCMALLOC)
   void OnTcmallocStats(const std::string& output);
 #endif