Type change in StackSamplingProfiler from void* to uintptr_t.

content/common/child_process_messages.h

 // 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.
 
 // Common IPC messages used for child processes.
 // Multiply-included message file, hence no include guard.
 
 #include <string>
 #include <vector>
 
 #include "base/memory/shared_memory.h"
+#include "base/profiler/stack_sampling_profiler.h"
 #include "base/tracked_objects.h"
 #include "base/values.h"
 #include "cc/resources/shared_bitmap_manager.h"
 #include "content/common/content_export.h"
 #include "content/common/host_discardable_shared_memory_manager.h"
+#include "content/common/profiled_stack_state.h"
 #include "ipc/ipc_message_macros.h"
 #include "ui/gfx/gpu_memory_buffer.h"
 #include "ui/gfx/ipc/gfx_param_traits.h"
 
 #if defined(OS_MACOSX)
 #include "content/common/mac/io_surface_manager_token.h"
 #endif
 
 IPC_ENUM_TRAITS_MAX_VALUE(tracked_objects::ThreadData::Status,
                           tracked_objects::ThreadData::STATUS_LAST)
@@ skipping 30 matching lines @@
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(tracked_objects::ProcessDataSnapshot)
   IPC_STRUCT_TRAITS_MEMBER(phased_snapshots)
   IPC_STRUCT_TRAITS_MEMBER(process_id)
 IPC_STRUCT_TRAITS_END()
 
 IPC_ENUM_TRAITS_MAX_VALUE(gfx::GpuMemoryBufferType,
                           gfx::GPU_MEMORY_BUFFER_TYPE_LAST)
 
+IPC_ENUM_TRAITS_MAX_VALUE(content::ProfiledStackState::Trigger,
+                          content::ProfiledStackState::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(content::ProfiledStackState)
+  IPC_STRUCT_TRAITS_MEMBER(trigger)
+  IPC_STRUCT_TRAITS_MEMBER(preserve_sample_ordering)
+  IPC_STRUCT_TRAITS_MEMBER(start_timestamp)
+  IPC_STRUCT_TRAITS_MEMBER(profiles)
+IPC_STRUCT_TRAITS_END()
+
 IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferHandle)
   IPC_STRUCT_TRAITS_MEMBER(id)
   IPC_STRUCT_TRAITS_MEMBER(type)
   IPC_STRUCT_TRAITS_MEMBER(handle)
 #if defined(USE_OZONE)
   IPC_STRUCT_TRAITS_MEMBER(native_pixmap_handle)
 #endif
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferId)
@@ skipping 61 matching lines @@
 IPC_MESSAGE_CONTROL2(
     ChildProcessHostMsg_ChildProfilerData,
     int, /* sequence_number */
     tracked_objects::ProcessDataSnapshot /* process_data_snapshot */)
 
 // Send back histograms as vector of pickled-histogram strings.
 IPC_MESSAGE_CONTROL2(ChildProcessHostMsg_ChildHistogramData,
                      int, /* sequence_number */
                      std::vector<std::string> /* histogram_data */)
 
+IPC_MESSAGE_CONTROL1(ChildProcessHostMsg_ChildStackProfilerData,
+                     content::ProfiledStackState /* profiles_state */)
+
 // 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.
 IPC_SYNC_MESSAGE_CONTROL1_1(ChildProcessHostMsg_GetBrowserHistogram,
                             std::string, /* histogram_name */
                             std::string /* histogram_json */)
 
 #if defined(OS_WIN)
 // Request that the given font be loaded by the host so it's cached by the
 // OS. Please see ChildProcessHost::PreCacheFont for details.
@@ skipping 52 matching lines @@
 IPC_SYNC_MESSAGE_CONTROL2_1(
     ChildProcessHostMsg_SyncAllocateLockedDiscardableSharedMemory,
     uint32 /* size */,
     content::DiscardableSharedMemoryId,
     base::SharedMemoryHandle)
 
 // Informs the browser that the child deleted a block of discardable shared
 // memory.
 IPC_MESSAGE_CONTROL1(ChildProcessHostMsg_DeletedDiscardableSharedMemory,
                      content::DiscardableSharedMemoryId)