Commit eca368e2 authored by Mike Wittman's avatar Mike Wittman Committed by Commit Bot

[Sampling profiler] Remove virtual function default argument

Default arguments on virtual functions are not permitted by the style
guide. The argument was also only unspecified in test code, which is
updated to always specify it.

Change-Id: If415e408c365f5a9c9b68273a369680934cf0ba6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1895970
Commit-Queue: Mike Wittman <wittman@chromium.org>
Reviewed-by: default avatarCharlie Andrews <charliea@chromium.org>
Cr-Commit-Position: refs/heads/master@{#712358}
parent 2860a178
...@@ -83,8 +83,7 @@ void CallStackProfileBuilder::RecordMetadata( ...@@ -83,8 +83,7 @@ void CallStackProfileBuilder::RecordMetadata(
} }
} }
if (metadata_provider) metadata_item_count_ = metadata_provider->GetItems(&metadata_items_);
metadata_item_count_ = metadata_provider->GetItems(&metadata_items_);
} }
void CallStackProfileBuilder::OnSampleCompleted( void CallStackProfileBuilder::OnSampleCompleted(
......
...@@ -70,8 +70,8 @@ class CallStackProfileBuilder : public base::ProfileBuilder { ...@@ -70,8 +70,8 @@ class CallStackProfileBuilder : public base::ProfileBuilder {
// base::ProfileBuilder: // base::ProfileBuilder:
base::ModuleCache* GetModuleCache() override; base::ModuleCache* GetModuleCache() override;
void RecordMetadata(base::ProfileBuilder::MetadataProvider* void RecordMetadata(
metadata_provider = nullptr) override; base::ProfileBuilder::MetadataProvider* metadata_provider) override;
void OnSampleCompleted(std::vector<base::Frame> frames) override; void OnSampleCompleted(std::vector<base::Frame> frames) override;
void OnProfileCompleted(base::TimeDelta profile_duration, void OnProfileCompleted(base::TimeDelta profile_duration,
base::TimeDelta sampling_period) override; base::TimeDelta sampling_period) override;
......
...@@ -116,9 +116,11 @@ TEST(CallStackProfileBuilderTest, ProfilingCompleted) { ...@@ -116,9 +116,11 @@ TEST(CallStackProfileBuilderTest, ProfilingCompleted) {
std::vector<base::Frame> frames1 = {frame1, frame2}; std::vector<base::Frame> frames1 = {frame1, frame2};
std::vector<base::Frame> frames2 = {frame3}; std::vector<base::Frame> frames2 = {frame3};
profile_builder->RecordMetadata(); profile_builder->RecordMetadata(
base::MetadataRecorder().CreateMetadataProvider().get());
profile_builder->OnSampleCompleted(frames1); profile_builder->OnSampleCompleted(frames1);
profile_builder->RecordMetadata(); profile_builder->RecordMetadata(
base::MetadataRecorder().CreateMetadataProvider().get());
profile_builder->OnSampleCompleted(frames2); profile_builder->OnSampleCompleted(frames2);
profile_builder->OnProfileCompleted(base::TimeDelta::FromMilliseconds(500), profile_builder->OnProfileCompleted(base::TimeDelta::FromMilliseconds(500),
base::TimeDelta::FromMilliseconds(100)); base::TimeDelta::FromMilliseconds(100));
...@@ -215,9 +217,11 @@ TEST(CallStackProfileBuilderTest, StacksDeduped) { ...@@ -215,9 +217,11 @@ TEST(CallStackProfileBuilderTest, StacksDeduped) {
// Two stacks are completed with the same frames therefore they are deduped // Two stacks are completed with the same frames therefore they are deduped
// to one. // to one.
profile_builder->RecordMetadata(); profile_builder->RecordMetadata(
base::MetadataRecorder().CreateMetadataProvider().get());
profile_builder->OnSampleCompleted(frames); profile_builder->OnSampleCompleted(frames);
profile_builder->RecordMetadata(); profile_builder->RecordMetadata(
base::MetadataRecorder().CreateMetadataProvider().get());
profile_builder->OnSampleCompleted(frames); profile_builder->OnSampleCompleted(frames);
profile_builder->OnProfileCompleted(base::TimeDelta(), base::TimeDelta()); profile_builder->OnProfileCompleted(base::TimeDelta(), base::TimeDelta());
...@@ -253,9 +257,11 @@ TEST(CallStackProfileBuilderTest, StacksNotDeduped) { ...@@ -253,9 +257,11 @@ TEST(CallStackProfileBuilderTest, StacksNotDeduped) {
std::vector<base::Frame> frames2 = {frame2}; std::vector<base::Frame> frames2 = {frame2};
// Two stacks are completed with the different frames therefore not deduped. // Two stacks are completed with the different frames therefore not deduped.
profile_builder->RecordMetadata(); profile_builder->RecordMetadata(
base::MetadataRecorder().CreateMetadataProvider().get());
profile_builder->OnSampleCompleted(frames1); profile_builder->OnSampleCompleted(frames1);
profile_builder->RecordMetadata(); profile_builder->RecordMetadata(
base::MetadataRecorder().CreateMetadataProvider().get());
profile_builder->OnSampleCompleted(frames2); profile_builder->OnSampleCompleted(frames2);
profile_builder->OnProfileCompleted(base::TimeDelta(), base::TimeDelta()); profile_builder->OnProfileCompleted(base::TimeDelta(), base::TimeDelta());
...@@ -297,7 +303,8 @@ TEST(CallStackProfileBuilderTest, Modules) { ...@@ -297,7 +303,8 @@ TEST(CallStackProfileBuilderTest, Modules) {
std::vector<base::Frame> frames = {frame1, frame2}; std::vector<base::Frame> frames = {frame1, frame2};
profile_builder->RecordMetadata(); profile_builder->RecordMetadata(
base::MetadataRecorder().CreateMetadataProvider().get());
profile_builder->OnSampleCompleted(frames); profile_builder->OnSampleCompleted(frames);
profile_builder->OnProfileCompleted(base::TimeDelta(), base::TimeDelta()); profile_builder->OnProfileCompleted(base::TimeDelta(), base::TimeDelta());
...@@ -347,7 +354,8 @@ TEST(CallStackProfileBuilderTest, DedupModules) { ...@@ -347,7 +354,8 @@ TEST(CallStackProfileBuilderTest, DedupModules) {
std::vector<base::Frame> frames = {frame1, frame2}; std::vector<base::Frame> frames = {frame1, frame2};
profile_builder->RecordMetadata(); profile_builder->RecordMetadata(
base::MetadataRecorder().CreateMetadataProvider().get());
profile_builder->OnSampleCompleted(frames); profile_builder->OnSampleCompleted(frames);
profile_builder->OnProfileCompleted(base::TimeDelta(), base::TimeDelta()); profile_builder->OnProfileCompleted(base::TimeDelta(), base::TimeDelta());
...@@ -398,21 +406,26 @@ TEST(CallStackProfileBuilderTest, WorkIds) { ...@@ -398,21 +406,26 @@ TEST(CallStackProfileBuilderTest, WorkIds) {
// Id 0 means the message loop hasn't been started yet, so the sample should // Id 0 means the message loop hasn't been started yet, so the sample should
// not have continued_work set. // not have continued_work set.
profile_builder->RecordMetadata(); profile_builder->RecordMetadata(
base::MetadataRecorder().CreateMetadataProvider().get());
profile_builder->OnSampleCompleted({frame}); profile_builder->OnSampleCompleted({frame});
// The second sample with the same id should have continued_work set. // The second sample with the same id should have continued_work set.
work_id_recorder.current_id = 1; work_id_recorder.current_id = 1;
profile_builder->RecordMetadata(); profile_builder->RecordMetadata(
base::MetadataRecorder().CreateMetadataProvider().get());
profile_builder->OnSampleCompleted({frame}); profile_builder->OnSampleCompleted({frame});
profile_builder->RecordMetadata(); profile_builder->RecordMetadata(
base::MetadataRecorder().CreateMetadataProvider().get());
profile_builder->OnSampleCompleted({frame}); profile_builder->OnSampleCompleted({frame});
// Ids are in general non-contiguous across multiple samples. // Ids are in general non-contiguous across multiple samples.
work_id_recorder.current_id = 10; work_id_recorder.current_id = 10;
profile_builder->RecordMetadata(); profile_builder->RecordMetadata(
base::MetadataRecorder().CreateMetadataProvider().get());
profile_builder->OnSampleCompleted({frame}); profile_builder->OnSampleCompleted({frame});
profile_builder->RecordMetadata(); profile_builder->RecordMetadata(
base::MetadataRecorder().CreateMetadataProvider().get());
profile_builder->OnSampleCompleted({frame}); profile_builder->OnSampleCompleted({frame});
profile_builder->OnProfileCompleted(base::TimeDelta::FromMilliseconds(500), profile_builder->OnProfileCompleted(base::TimeDelta::FromMilliseconds(500),
...@@ -439,7 +452,8 @@ TEST(CallStackProfileBuilderTest, MetadataRecorder_NoItems) { ...@@ -439,7 +452,8 @@ TEST(CallStackProfileBuilderTest, MetadataRecorder_NoItems) {
TestModule module; TestModule module;
base::Frame frame = {0x10, &module}; base::Frame frame = {0x10, &module};
profile_builder->RecordMetadata(); profile_builder->RecordMetadata(
metadata_recorder.CreateMetadataProvider().get());
profile_builder->OnSampleCompleted({frame}); profile_builder->OnSampleCompleted({frame});
profile_builder->OnProfileCompleted(base::TimeDelta::FromMilliseconds(500), profile_builder->OnProfileCompleted(base::TimeDelta::FromMilliseconds(500),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment