summaryrefslogtreecommitdiffstats
path: root/content/browser/tracing/tracing_controller_impl.h
diff options
context:
space:
mode:
authorssid <ssid@chromium.org>2015-07-28 13:28:14 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-28 20:28:53 +0000
commit1050d808db3ffd5d2728cc23f863d2cd7021efd3 (patch)
tree5c4fee31a72a9f94f638b89a90ae3906e562c1e5 /content/browser/tracing/tracing_controller_impl.h
parent7140023dc39880f9c05fda2972ada219cbcbae7c (diff)
downloadchromium_src-1050d808db3ffd5d2728cc23f863d2cd7021efd3.zip
chromium_src-1050d808db3ffd5d2728cc23f863d2cd7021efd3.tar.gz
chromium_src-1050d808db3ffd5d2728cc23f863d2cd7021efd3.tar.bz2
[tracing] Fix memory-infra tracing process id translation for single process mode
The host discardable memory dump provider creates a global guid using child's tracing process id and segment id for each segment to match with the id used for segments in the child side to avoid double counting of the memory segments. In single process mode, the child dump manager does not receive a tracing process id, and it uses kInvalidTracingProcessId. But the host still uses the child process id created for message filter for creating the tracing id for child. This CL fixes the method ChildProcessIdToTracingProcessId to return constant values when called in single process mode. The ChildProcessIdToTracingProcessId is moved to child_process_host_impl so that it can be aware of single process mode and since it is tightly coupled with the GenerateChildProcessUniqueId function BUG=510776 Review URL: https://codereview.chromium.org/1232703007 Cr-Commit-Position: refs/heads/master@{#340759}
Diffstat (limited to 'content/browser/tracing/tracing_controller_impl.h')
-rw-r--r--content/browser/tracing/tracing_controller_impl.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/content/browser/tracing/tracing_controller_impl.h b/content/browser/tracing/tracing_controller_impl.h
index 3a3a652..4165a0a 100644
--- a/content/browser/tracing/tracing_controller_impl.h
+++ b/content/browser/tracing/tracing_controller_impl.h
@@ -60,6 +60,7 @@ class TracingControllerImpl
const base::trace_event::MemoryDumpRequestArgs& args,
const base::trace_event::MemoryDumpCallback& callback) override;
bool IsCoordinatorProcess() const override;
+ uint64 GetTracingProcessId() const override;
typedef base::Callback<void(TraceMessageFilter*)>
TraceMessageFilterAddedCallback;