| Index: content/browser/profiler_message_filter.cc
|
| diff --git a/content/browser/profiler_message_filter.cc b/content/browser/profiler_message_filter.cc
|
| index e0f59799b66218751bc0c1aaaee579c099f7dfda..d94c7d165ca088756fc8be3e72f1bbbc87d8a9b9 100644
|
| --- a/content/browser/profiler_message_filter.cc
|
| +++ b/content/browser/profiler_message_filter.cc
|
| @@ -5,14 +5,13 @@
|
| #include "content/browser/profiler_message_filter.h"
|
|
|
| #include "base/tracked_objects.h"
|
| -#include "base/values.h"
|
| #include "content/browser/profiler_controller_impl.h"
|
| #include "content/common/child_process_messages.h"
|
|
|
| -using content::BrowserMessageFilter;
|
| -using content::BrowserThread;
|
| +namespace content {
|
|
|
| -ProfilerMessageFilter::ProfilerMessageFilter() {
|
| +ProfilerMessageFilter::ProfilerMessageFilter(ProcessType process_type)
|
| + : process_type_(process_type) {
|
| }
|
|
|
| ProfilerMessageFilter::~ProfilerMessageFilter() {
|
| @@ -39,10 +38,9 @@ bool ProfilerMessageFilter::OnMessageReceived(const IPC::Message& message,
|
|
|
| void ProfilerMessageFilter::OnChildProfilerData(
|
| int sequence_number,
|
| - const base::DictionaryValue& profiler_data) {
|
| - base::DictionaryValue* dictionary_value = new base::DictionaryValue;
|
| - dictionary_value->MergeDictionary(&profiler_data);
|
| - // OnProfilerDataCollected assumes the ownership of profiler_data.
|
| - content::ProfilerControllerImpl::GetInstance()->OnProfilerDataCollected(
|
| - sequence_number, dictionary_value);
|
| + const tracked_objects::ProcessDataSnapshot& profiler_data) {
|
| + ProfilerControllerImpl::GetInstance()->OnProfilerDataCollected(
|
| + sequence_number, profiler_data, process_type_);
|
| +}
|
| +
|
| }
|
|
|