Type change in StackSamplingProfiler from void* to uintptr_t.

content/common/child_process_messages.h

Index: content/common/child_process_messages.h
diff --git a/content/common/child_process_messages.h b/content/common/child_process_messages.h
index 18d7245e89b243a9967bd238fe75b0cf21f006b6..e88a4b0cf786f9055f6bf62b591714b5cf489269 100644
--- a/content/common/child_process_messages.h
+++ b/content/common/child_process_messages.h
@@ -9,6 +9,8 @@
 #include <vector>
 
 #include "base/memory/shared_memory.h"
+#include "base/metrics/call_stack_profile_params.h"
+#include "base/profiler/stack_sampling_profiler.h"
 #include "base/tracked_objects.h"
 #include "base/values.h"
 #include "cc/resources/shared_bitmap_manager.h"
@@ -64,6 +66,32 @@ IPC_STRUCT_TRAITS_END()
 IPC_ENUM_TRAITS_MAX_VALUE(gfx::GpuMemoryBufferType,
                           gfx::GPU_MEMORY_BUFFER_TYPE_LAST)
 
+IPC_ENUM_TRAITS_MAX_VALUE(base::CallStackProfileParams::Trigger,
+                          base::CallStackProfileParams::TRIGGER_LAST)
+
+IPC_STRUCT_TRAITS_BEGIN(base::StackSamplingProfiler::Module)
+  IPC_STRUCT_TRAITS_MEMBER(base_address)
+  IPC_STRUCT_TRAITS_MEMBER(id)
+  IPC_STRUCT_TRAITS_MEMBER(filename)
+IPC_STRUCT_TRAITS_END()
+
+IPC_STRUCT_TRAITS_BEGIN(base::StackSamplingProfiler::Frame)
+  IPC_STRUCT_TRAITS_MEMBER(instruction_pointer)
+  IPC_STRUCT_TRAITS_MEMBER(module_index)
+IPC_STRUCT_TRAITS_END()
+
+IPC_STRUCT_TRAITS_BEGIN(base::StackSamplingProfiler::CallStackProfile)
+  IPC_STRUCT_TRAITS_MEMBER(modules)
+  IPC_STRUCT_TRAITS_MEMBER(samples)
+  IPC_STRUCT_TRAITS_MEMBER(profile_duration)
+  IPC_STRUCT_TRAITS_MEMBER(sampling_period)
+IPC_STRUCT_TRAITS_END()
+
+IPC_STRUCT_TRAITS_BEGIN(base::CallStackProfileParams)
+  IPC_STRUCT_TRAITS_MEMBER(trigger)
+  IPC_STRUCT_TRAITS_MEMBER(preserve_sample_ordering)
+IPC_STRUCT_TRAITS_END()
+
 IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferHandle)
   IPC_STRUCT_TRAITS_MEMBER(id)
   IPC_STRUCT_TRAITS_MEMBER(type)
@@ -145,6 +173,12 @@ IPC_MESSAGE_CONTROL2(ChildProcessHostMsg_ChildHistogramData,
                      int, /* sequence_number */
                      std::vector<std::string> /* histogram_data */)
 
+IPC_MESSAGE_CONTROL3(
+    ChildProcessHostMsg_ChildStackProfilerData,
+    base::StackSamplingProfiler::CallStackProfiles, /* profiler_data */
+    base::CallStackProfileParams,                   /* params */
+    base::TimeTicks /* start_timestamp */)
+
 // Request a histogram from the browser. The browser will send the histogram
 // data only if it has been passed the command line flag
 // switches::kDomAutomationController.