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

Rename StackSamplingBrowserTest => ThreadProfilerBrowserTest

Updates the name to be consistent with the source and tests in
//chrome/common/profiler.

Change-Id: Ic181aa3a67435a2af3e3e4592d06f5492ebb1f37
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2437603
Commit-Queue: Mike Wittman <wittman@chromium.org>
Reviewed-by: default avatarEtienne Pierre-Doray <etiennep@chromium.org>
Cr-Commit-Position: refs/heads/master@{#811842}
parent c536941f
...@@ -106,7 +106,7 @@ bool MatchesProfile(metrics::SampledProfile::TriggerEvent trigger_event, ...@@ -106,7 +106,7 @@ bool MatchesProfile(metrics::SampledProfile::TriggerEvent trigger_event,
profile.process() == process && profile.thread() == thread; profile.process() == process && profile.thread() == thread;
} }
class StackSamplingBrowserTest : public PlatformBrowserTest { class ThreadProfilerBrowserTest : public PlatformBrowserTest {
public: public:
void SetUp() override { void SetUp() override {
// Arrange to intercept the CPU profiles at the time they're provided to the // Arrange to intercept the CPU profiles at the time they're provided to the
...@@ -173,56 +173,56 @@ bool WaitForProfile(metrics::SampledProfile::TriggerEvent trigger_event, ...@@ -173,56 +173,56 @@ bool WaitForProfile(metrics::SampledProfile::TriggerEvent trigger_event,
// processes/threads. We've seen multiple breakages previously where profiles // processes/threads. We've seen multiple breakages previously where profiles
// were dropped as a result of bugs introduced by mojo refactorings. // were dropped as a result of bugs introduced by mojo refactorings.
IN_PROC_BROWSER_TEST_F(StackSamplingBrowserTest, BrowserProcessMainThread) { IN_PROC_BROWSER_TEST_F(ThreadProfilerBrowserTest, BrowserProcessMainThread) {
if (ShouldSkipTestForMacOS11()) if (ShouldSkipTestForMacOS11())
GTEST_SKIP() << "Stack sampler is not supported on macOS 11."; GTEST_SKIP() << "Stack sampler is not supported on macOS 11.";
EXPECT_TRUE(WaitForProfile(metrics::SampledProfile::PROCESS_STARTUP, EXPECT_TRUE(WaitForProfile(metrics::SampledProfile::PROCESS_STARTUP,
metrics::BROWSER_PROCESS, metrics::MAIN_THREAD)); metrics::BROWSER_PROCESS, metrics::MAIN_THREAD));
} }
IN_PROC_BROWSER_TEST_F(StackSamplingBrowserTest, BrowserProcessIOThread) { IN_PROC_BROWSER_TEST_F(ThreadProfilerBrowserTest, BrowserProcessIOThread) {
if (ShouldSkipTestForMacOS11()) if (ShouldSkipTestForMacOS11())
GTEST_SKIP() << "Stack sampler is not supported on macOS 11."; GTEST_SKIP() << "Stack sampler is not supported on macOS 11.";
EXPECT_TRUE(WaitForProfile(metrics::SampledProfile::PROCESS_STARTUP, EXPECT_TRUE(WaitForProfile(metrics::SampledProfile::PROCESS_STARTUP,
metrics::BROWSER_PROCESS, metrics::IO_THREAD)); metrics::BROWSER_PROCESS, metrics::IO_THREAD));
} }
IN_PROC_BROWSER_TEST_F(StackSamplingBrowserTest, GpuProcessMainThread) { IN_PROC_BROWSER_TEST_F(ThreadProfilerBrowserTest, GpuProcessMainThread) {
if (ShouldSkipTestForMacOS11()) if (ShouldSkipTestForMacOS11())
GTEST_SKIP() << "Stack sampler is not supported on macOS 11."; GTEST_SKIP() << "Stack sampler is not supported on macOS 11.";
EXPECT_TRUE(WaitForProfile(metrics::SampledProfile::PROCESS_STARTUP, EXPECT_TRUE(WaitForProfile(metrics::SampledProfile::PROCESS_STARTUP,
metrics::GPU_PROCESS, metrics::MAIN_THREAD)); metrics::GPU_PROCESS, metrics::MAIN_THREAD));
} }
IN_PROC_BROWSER_TEST_F(StackSamplingBrowserTest, GpuProcessIOThread) { IN_PROC_BROWSER_TEST_F(ThreadProfilerBrowserTest, GpuProcessIOThread) {
if (ShouldSkipTestForMacOS11()) if (ShouldSkipTestForMacOS11())
GTEST_SKIP() << "Stack sampler is not supported on macOS 11."; GTEST_SKIP() << "Stack sampler is not supported on macOS 11.";
EXPECT_TRUE(WaitForProfile(metrics::SampledProfile::PROCESS_STARTUP, EXPECT_TRUE(WaitForProfile(metrics::SampledProfile::PROCESS_STARTUP,
metrics::GPU_PROCESS, metrics::IO_THREAD)); metrics::GPU_PROCESS, metrics::IO_THREAD));
} }
IN_PROC_BROWSER_TEST_F(StackSamplingBrowserTest, GpuProcessCompositorThread) { IN_PROC_BROWSER_TEST_F(ThreadProfilerBrowserTest, GpuProcessCompositorThread) {
if (ShouldSkipTestForMacOS11()) if (ShouldSkipTestForMacOS11())
GTEST_SKIP() << "Stack sampler is not supported on macOS 11."; GTEST_SKIP() << "Stack sampler is not supported on macOS 11.";
EXPECT_TRUE(WaitForProfile(metrics::SampledProfile::PROCESS_STARTUP, EXPECT_TRUE(WaitForProfile(metrics::SampledProfile::PROCESS_STARTUP,
metrics::GPU_PROCESS, metrics::COMPOSITOR_THREAD)); metrics::GPU_PROCESS, metrics::COMPOSITOR_THREAD));
} }
IN_PROC_BROWSER_TEST_F(StackSamplingBrowserTest, RendererProcessMainThread) { IN_PROC_BROWSER_TEST_F(ThreadProfilerBrowserTest, RendererProcessMainThread) {
if (ShouldSkipTestForMacOS11()) if (ShouldSkipTestForMacOS11())
GTEST_SKIP() << "Stack sampler is not supported on macOS 11."; GTEST_SKIP() << "Stack sampler is not supported on macOS 11.";
EXPECT_TRUE(WaitForProfile(metrics::SampledProfile::PROCESS_STARTUP, EXPECT_TRUE(WaitForProfile(metrics::SampledProfile::PROCESS_STARTUP,
metrics::RENDERER_PROCESS, metrics::MAIN_THREAD)); metrics::RENDERER_PROCESS, metrics::MAIN_THREAD));
} }
IN_PROC_BROWSER_TEST_F(StackSamplingBrowserTest, RendererProcessIOThread) { IN_PROC_BROWSER_TEST_F(ThreadProfilerBrowserTest, RendererProcessIOThread) {
if (ShouldSkipTestForMacOS11()) if (ShouldSkipTestForMacOS11())
GTEST_SKIP() << "Stack sampler is not supported on macOS 11."; GTEST_SKIP() << "Stack sampler is not supported on macOS 11.";
EXPECT_TRUE(WaitForProfile(metrics::SampledProfile::PROCESS_STARTUP, EXPECT_TRUE(WaitForProfile(metrics::SampledProfile::PROCESS_STARTUP,
metrics::RENDERER_PROCESS, metrics::IO_THREAD)); metrics::RENDERER_PROCESS, metrics::IO_THREAD));
} }
IN_PROC_BROWSER_TEST_F(StackSamplingBrowserTest, IN_PROC_BROWSER_TEST_F(ThreadProfilerBrowserTest,
RendererProcessCompositorThread) { RendererProcessCompositorThread) {
if (ShouldSkipTestForMacOS11()) if (ShouldSkipTestForMacOS11())
GTEST_SKIP() << "Stack sampler is not supported on macOS 11."; GTEST_SKIP() << "Stack sampler is not supported on macOS 11.";
...@@ -238,7 +238,7 @@ IN_PROC_BROWSER_TEST_F(StackSamplingBrowserTest, ...@@ -238,7 +238,7 @@ IN_PROC_BROWSER_TEST_F(StackSamplingBrowserTest,
#else #else
#define MAYBE_NetworkServiceProcessIOThread NetworkServiceProcessIOThread #define MAYBE_NetworkServiceProcessIOThread NetworkServiceProcessIOThread
#endif #endif
IN_PROC_BROWSER_TEST_F(StackSamplingBrowserTest, IN_PROC_BROWSER_TEST_F(ThreadProfilerBrowserTest,
MAYBE_NetworkServiceProcessIOThread) { MAYBE_NetworkServiceProcessIOThread) {
if (ShouldSkipTestForMacOS11()) if (ShouldSkipTestForMacOS11())
GTEST_SKIP() << "Stack sampler is not supported on macOS 11."; GTEST_SKIP() << "Stack sampler is not supported on macOS 11.";
......
...@@ -556,7 +556,7 @@ if (is_android) { ...@@ -556,7 +556,7 @@ if (is_android) {
# "strip_debug" config that strips the debug info, on android_browsertests # "strip_debug" config that strips the debug info, on android_browsertests
# apk. # apk.
if (enable_arm_cfi_table) { if (enable_arm_cfi_table) {
sources += [ "../common/profiler/stack_sampling_browsertest.cc" ] sources += [ "../common/profiler/thread_profiler_browsertest.cc" ]
deps += [ deps += [
"//chrome/android/modules/stack_unwinder/internal:java", "//chrome/android/modules/stack_unwinder/internal:java",
"//chrome/android/modules/stack_unwinder/internal:stack_unwinder_for_testing", "//chrome/android/modules/stack_unwinder/internal:stack_unwinder_for_testing",
...@@ -2840,7 +2840,7 @@ if (!is_android) { ...@@ -2840,7 +2840,7 @@ if (!is_android) {
"../browser/ui/cocoa/task_manager_mac_browsertest.mm", "../browser/ui/cocoa/task_manager_mac_browsertest.mm",
"../browser/ui/cocoa/touchbar/browser_window_touch_bar_controller_browsertest.mm", "../browser/ui/cocoa/touchbar/browser_window_touch_bar_controller_browsertest.mm",
"../browser/ui/views/frame/browser_non_client_frame_view_mac_browsertest.cc", "../browser/ui/views/frame/browser_non_client_frame_view_mac_browsertest.cc",
"../common/profiler/stack_sampling_browsertest.cc", "../common/profiler/thread_profiler_browsertest.cc",
# TODO(crbug/845389): Re-Enable the following, which were temporarily # TODO(crbug/845389): Re-Enable the following, which were temporarily
# omitted from the build, but are still in use. # omitted from the build, but are still in use.
...@@ -2877,7 +2877,7 @@ if (!is_android) { ...@@ -2877,7 +2877,7 @@ if (!is_android) {
] ]
if (target_cpu == "x64") { if (target_cpu == "x64") {
sources += [ "../common/profiler/stack_sampling_browsertest.cc" ] sources += [ "../common/profiler/thread_profiler_browsertest.cc" ]
} }
configs += [ "//build/config/win:delayloads" ] configs += [ "//build/config/win:delayloads" ]
......
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