Type change in StackSamplingProfiler from void* to uintptr_t.

content/browser/profiler_message_filter.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.
 
 #ifndef CONTENT_BROWSER_PROFILER_MESSAGE_FILTER_H_
 #define CONTENT_BROWSER_PROFILER_MESSAGE_FILTER_H_
 
 #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"
 
 namespace tracked_objects {
 struct ProcessDataSnapshot;
 }
 
 namespace content {
 
 // This class sends and receives profiler messages in the browser process.
 class ProfilerMessageFilter : public BrowserMessageFilter {
  public:
   explicit ProfilerMessageFilter(content::ProcessType process_type);
 
   // BrowserMessageFilter implementation.
   void OnChannelConnected(int32 peer_pid) override;
 
   // BrowserMessageFilter implementation.
   bool OnMessageReceived(const IPC::Message& message) override;
 
  protected:
   ~ProfilerMessageFilter() override;
 
  private:
   // Message handlers.
   void OnChildProfilerData(
       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
 
   content::ProcessType process_type_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfilerMessageFilter);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_PROFILER_MESSAGE_FILTER_H_