Index: components/metrics/child_call_stack_profile_collector_unittest.cc |
diff --git a/components/metrics/child_call_stack_profile_collector_unittest.cc b/components/metrics/child_call_stack_profile_collector_unittest.cc |
index 9666fe8a5e494eec667fbb470891f657449a3166..556124feed9b152ddd17f055e4b9e3ede5b82677 100644 |
--- a/components/metrics/child_call_stack_profile_collector_unittest.cc |
+++ b/components/metrics/child_call_stack_profile_collector_unittest.cc |
@@ -78,11 +78,16 @@ TEST_F(ChildCallStackProfileCollectorTest, InterfaceProvided) { |
// Add profiles before providing the interface. |
CollectProfiles( |
- CallStackProfileParams(CallStackProfileParams::JANKY_TASK, |
+ CallStackProfileParams(CallStackProfileParams::BROWSER_PROCESS, |
+ CallStackProfileParams::UI_THREAD, |
+ CallStackProfileParams::JANKY_TASK, |
CallStackProfileParams::PRESERVE_ORDER), |
{ base::StackSamplingProfiler::CallStackProfile(), |
base::StackSamplingProfiler::CallStackProfile() }); |
ASSERT_EQ(1u, profiles().size()); |
+ EXPECT_EQ(CallStackProfileParams::BROWSER_PROCESS, |
+ profiles()[0].params.process); |
+ EXPECT_EQ(CallStackProfileParams::UI_THREAD, profiles()[0].params.thread); |
EXPECT_EQ(CallStackProfileParams::JANKY_TASK, profiles()[0].params.trigger); |
EXPECT_EQ(CallStackProfileParams::PRESERVE_ORDER, |
profiles()[0].params.ordering_spec); |
@@ -107,12 +112,18 @@ TEST_F(ChildCallStackProfileCollectorTest, InterfaceProvided) { |
// it. |
receiver_impl_->profiles.clear(); |
CollectProfiles( |
- CallStackProfileParams(CallStackProfileParams::THREAD_HUNG, |
+ CallStackProfileParams(CallStackProfileParams::GPU_PROCESS, |
+ CallStackProfileParams::GPU_MAIN_THREAD, |
+ CallStackProfileParams::THREAD_HUNG, |
CallStackProfileParams::PRESERVE_ORDER), |
{ base::StackSamplingProfiler::CallStackProfile() }); |
base::RunLoop().RunUntilIdle(); |
EXPECT_EQ(0u, profiles().size()); |
ASSERT_EQ(1u, receiver_impl_->profiles.size()); |
+ EXPECT_EQ(CallStackProfileParams::GPU_PROCESS, |
+ receiver_impl_->profiles[0].params.process); |
+ EXPECT_EQ(CallStackProfileParams::GPU_MAIN_THREAD, |
+ receiver_impl_->profiles[0].params.thread); |
EXPECT_EQ(CallStackProfileParams::THREAD_HUNG, |
receiver_impl_->profiles[0].params.trigger); |
EXPECT_EQ(CallStackProfileParams::PRESERVE_ORDER, |
@@ -128,11 +139,16 @@ TEST_F(ChildCallStackProfileCollectorTest, InterfaceNotProvided) { |
// Add profiles before providing a null interface. |
CollectProfiles( |
- CallStackProfileParams(CallStackProfileParams::JANKY_TASK, |
+ CallStackProfileParams(CallStackProfileParams::BROWSER_PROCESS, |
+ CallStackProfileParams::UI_THREAD, |
+ CallStackProfileParams::JANKY_TASK, |
CallStackProfileParams::PRESERVE_ORDER), |
{ base::StackSamplingProfiler::CallStackProfile(), |
base::StackSamplingProfiler::CallStackProfile() }); |
ASSERT_EQ(1u, profiles().size()); |
+ EXPECT_EQ(CallStackProfileParams::BROWSER_PROCESS, |
+ profiles()[0].params.process); |
+ EXPECT_EQ(CallStackProfileParams::UI_THREAD, profiles()[0].params.thread); |
EXPECT_EQ(CallStackProfileParams::JANKY_TASK, profiles()[0].params.trigger); |
EXPECT_EQ(CallStackProfileParams::PRESERVE_ORDER, |
profiles()[0].params.ordering_spec); |
@@ -148,7 +164,9 @@ TEST_F(ChildCallStackProfileCollectorTest, InterfaceNotProvided) { |
// Add profiles after providing a null interface. They should also be flushed. |
CollectProfiles( |
- CallStackProfileParams(CallStackProfileParams::THREAD_HUNG, |
+ CallStackProfileParams(CallStackProfileParams::GPU_PROCESS, |
+ CallStackProfileParams::GPU_MAIN_THREAD, |
+ CallStackProfileParams::THREAD_HUNG, |
CallStackProfileParams::PRESERVE_ORDER), |
{ base::StackSamplingProfiler::CallStackProfile() }); |
EXPECT_EQ(0u, profiles().size()); |