Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(114)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/tracing/background_tracing_manager_browsertest.cc

Issue 2155283002: Slow Reports - Check results of SetActiveScenario in browser tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/tracing/background_tracing_manager_browsertest.cc
diff --git a/content/browser/tracing/background_tracing_manager_browsertest.cc b/content/browser/tracing/background_tracing_manager_browsertest.cc
index e3be3c57cb4a356cd18d924f0255c528d8e26df5..af69655408084b00e4ff5b0363bac593185af3d9 100644
--- a/content/browser/tracing/background_tracing_manager_browsertest.cc
+++ b/content/browser/tracing/background_tracing_manager_browsertest.cc
@@ -170,9 +170,9 @@ IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
BackgroundTracingManager::
GetInstance()->RegisterTriggerType("preemptive_test");
- BackgroundTracingManager::GetInstance()->SetActiveScenario(
+ EXPECT_TRUE(BackgroundTracingManager::GetInstance()->SetActiveScenario(
std::move(config), upload_config_wrapper.get_receive_callback(),
- BackgroundTracingManager::NO_DATA_FILTERING);
+ BackgroundTracingManager::NO_DATA_FILTERING));
BackgroundTracingManager::GetInstance()->WhenIdle(
base::Bind(&DisableScenarioWhenIdle));
@@ -202,9 +202,9 @@ IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
content::BackgroundTracingManager::GetInstance()->RegisterTriggerType(
"preemptive_test");
- BackgroundTracingManager::GetInstance()->SetActiveScenario(
+ EXPECT_TRUE(BackgroundTracingManager::GetInstance()->SetActiveScenario(
std::move(config), upload_config_wrapper.get_receive_callback(),
- BackgroundTracingManager::NO_DATA_FILTERING);
+ BackgroundTracingManager::NO_DATA_FILTERING));
BackgroundTracingManager::GetInstance()->WhenIdle(
base::Bind(&DisableScenarioWhenIdle));
@@ -408,9 +408,9 @@ IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
BackgroundTracingManager::TriggerHandle handle2 =
BackgroundTracingManager::GetInstance()->RegisterTriggerType("test2");
- BackgroundTracingManager::GetInstance()->SetActiveScenario(
+ EXPECT_TRUE(BackgroundTracingManager::GetInstance()->SetActiveScenario(
std::move(config), upload_config_wrapper.get_receive_callback(),
- BackgroundTracingManager::NO_DATA_FILTERING);
+ BackgroundTracingManager::NO_DATA_FILTERING));
BackgroundTracingManager::GetInstance()->WhenIdle(
base::Bind(&DisableScenarioWhenIdle));
@@ -550,9 +550,9 @@ IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
BackgroundTracingConfigImpl::FromDict(&dict));
EXPECT_TRUE(config);
- BackgroundTracingManager::GetInstance()->SetActiveScenario(
+ EXPECT_TRUE(BackgroundTracingManager::GetInstance()->SetActiveScenario(
std::move(config), upload_config_wrapper.get_receive_callback(),
- BackgroundTracingManager::NO_DATA_FILTERING);
+ BackgroundTracingManager::NO_DATA_FILTERING));
BackgroundTracingManager::GetInstance()->WhenIdle(
base::Bind(&DisableScenarioWhenIdle));
@@ -626,9 +626,9 @@ IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
content::BackgroundTracingManager::GetInstance()->RegisterTriggerType(
"does_not_exist");
- BackgroundTracingManager::GetInstance()->SetActiveScenario(
+ EXPECT_TRUE(BackgroundTracingManager::GetInstance()->SetActiveScenario(
std::move(config), upload_config_wrapper.get_receive_callback(),
- BackgroundTracingManager::NO_DATA_FILTERING);
+ BackgroundTracingManager::NO_DATA_FILTERING));
BackgroundTracingManager::GetInstance()->WhenIdle(
base::Bind(&DisableScenarioWhenIdle));
@@ -662,9 +662,9 @@ IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
content::BackgroundTracingManager::GetInstance()
->InvalidateTriggerHandlesForTesting();
- BackgroundTracingManager::GetInstance()->SetActiveScenario(
+ EXPECT_TRUE(BackgroundTracingManager::GetInstance()->SetActiveScenario(
std::move(config), upload_config_wrapper.get_receive_callback(),
- BackgroundTracingManager::NO_DATA_FILTERING);
+ BackgroundTracingManager::NO_DATA_FILTERING));
BackgroundTracingManager::GetInstance()->WhenIdle(
base::Bind(&DisableScenarioWhenIdle));
@@ -714,9 +714,9 @@ IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
content::BackgroundTracingManager::GetInstance()->RegisterTriggerType(
"preemptive_test");
- BackgroundTracingManager::GetInstance()->SetActiveScenario(
+ EXPECT_TRUE(BackgroundTracingManager::GetInstance()->SetActiveScenario(
std::move(config), upload_config_wrapper.get_receive_callback(),
- BackgroundTracingManager::NO_DATA_FILTERING);
+ BackgroundTracingManager::NO_DATA_FILTERING));
BackgroundTracingManager::GetInstance()->WhenIdle(
base::Bind(&DisableScenarioWhenIdle));
@@ -768,9 +768,9 @@ IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
content::BackgroundTracingManager::GetInstance()->RegisterTriggerType(
"preemptive_test");
- BackgroundTracingManager::GetInstance()->SetActiveScenario(
+ EXPECT_TRUE(BackgroundTracingManager::GetInstance()->SetActiveScenario(
std::move(config), upload_config_wrapper.get_receive_callback(),
- BackgroundTracingManager::NO_DATA_FILTERING);
+ BackgroundTracingManager::NO_DATA_FILTERING));
BackgroundTracingManager::GetInstance()->WhenIdle(
base::Bind(&DisableScenarioWhenIdle));
@@ -817,9 +817,12 @@ IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
BackgroundTracingConfigImpl::FromDict(&dict));
EXPECT_TRUE(config);
- BackgroundTracingManager::GetInstance()->SetActiveScenario(
+ EXPECT_TRUE(BackgroundTracingManager::GetInstance()->SetActiveScenario(
std::move(config), upload_config_wrapper.get_receive_callback(),
- BackgroundTracingManager::NO_DATA_FILTERING);
+ BackgroundTracingManager::NO_DATA_FILTERING));
+
+ BackgroundTracingManager::GetInstance()->WhenIdle(
+ base::Bind(&DisableScenarioWhenIdle));
// Our reference value is "1", so a value of "2" should trigger a trace.
LOCAL_HISTOGRAM_COUNTS("fake", 2);
@@ -862,9 +865,12 @@ IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
BackgroundTracingConfigImpl::FromDict(&dict));
EXPECT_TRUE(config);
- BackgroundTracingManager::GetInstance()->SetActiveScenario(
+ EXPECT_TRUE(BackgroundTracingManager::GetInstance()->SetActiveScenario(
std::move(config), upload_config_wrapper.get_receive_callback(),
- BackgroundTracingManager::NO_DATA_FILTERING);
+ BackgroundTracingManager::NO_DATA_FILTERING));
+
+ BackgroundTracingManager::GetInstance()->WhenIdle(
+ base::Bind(&DisableScenarioWhenIdle));
// Our reference value is "1", so a value of "2" should trigger a trace.
LOCAL_HISTOGRAM_COUNTS("fake", 2);
@@ -907,9 +913,12 @@ IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
BackgroundTracingConfigImpl::FromDict(&dict));
EXPECT_TRUE(config);
- BackgroundTracingManager::GetInstance()->SetActiveScenario(
+ EXPECT_TRUE(BackgroundTracingManager::GetInstance()->SetActiveScenario(
std::move(config), upload_config_wrapper.get_receive_callback(),
- BackgroundTracingManager::NO_DATA_FILTERING);
+ BackgroundTracingManager::NO_DATA_FILTERING));
+
+ BackgroundTracingManager::GetInstance()->WhenIdle(
+ base::Bind(&DisableScenarioWhenIdle));
// This should fail to trigger a trace since the sample value < the
// the reference value above.
@@ -954,9 +963,12 @@ IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
BackgroundTracingConfigImpl::FromDict(&dict));
EXPECT_TRUE(config);
- BackgroundTracingManager::GetInstance()->SetActiveScenario(
+ EXPECT_TRUE(BackgroundTracingManager::GetInstance()->SetActiveScenario(
std::move(config), upload_config_wrapper.get_receive_callback(),
- BackgroundTracingManager::NO_DATA_FILTERING);
+ BackgroundTracingManager::NO_DATA_FILTERING));
+
+ BackgroundTracingManager::GetInstance()->WhenIdle(
+ base::Bind(&DisableScenarioWhenIdle));
// This should fail to trigger a trace since the sample value > the
// the upper reference value above.
@@ -1014,9 +1026,9 @@ IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
BackgroundTracingManager::
GetInstance()->RegisterTriggerType("reactive_test");
- BackgroundTracingManager::GetInstance()->SetActiveScenario(
+ EXPECT_TRUE(BackgroundTracingManager::GetInstance()->SetActiveScenario(
std::move(config), upload_config_wrapper.get_receive_callback(),
- BackgroundTracingManager::NO_DATA_FILTERING);
+ BackgroundTracingManager::NO_DATA_FILTERING));
BackgroundTracingManager::GetInstance()->WhenIdle(
base::Bind(&DisableScenarioWhenIdle));
@@ -1048,9 +1060,9 @@ IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
BackgroundTracingManager::
GetInstance()->RegisterTriggerType("reactive_test");
- BackgroundTracingManager::GetInstance()->SetActiveScenario(
+ EXPECT_TRUE(BackgroundTracingManager::GetInstance()->SetActiveScenario(
std::move(config), upload_config_wrapper.get_receive_callback(),
- BackgroundTracingManager::NO_DATA_FILTERING);
+ BackgroundTracingManager::NO_DATA_FILTERING));
BackgroundTracingManager::GetInstance()->WhenIdle(
base::Bind(&DisableScenarioWhenIdle));
@@ -1111,9 +1123,9 @@ IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
BackgroundTracingManager::GetInstance()->RegisterTriggerType(
"reactive_test2");
- BackgroundTracingManager::GetInstance()->SetActiveScenario(
+ EXPECT_TRUE(BackgroundTracingManager::GetInstance()->SetActiveScenario(
std::move(config), upload_config_wrapper.get_receive_callback(),
- BackgroundTracingManager::NO_DATA_FILTERING);
+ BackgroundTracingManager::NO_DATA_FILTERING));
BackgroundTracingManager::GetInstance()->WhenIdle(
base::Bind(&DisableScenarioWhenIdle));
@@ -1152,9 +1164,9 @@ IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
BackgroundTracingManager::
GetInstance()->RegisterTriggerType("reactive_test");
- BackgroundTracingManager::GetInstance()->SetActiveScenario(
+ EXPECT_TRUE(BackgroundTracingManager::GetInstance()->SetActiveScenario(
std::move(config), upload_config_wrapper.get_receive_callback(),
- BackgroundTracingManager::NO_DATA_FILTERING);
+ BackgroundTracingManager::NO_DATA_FILTERING));
BackgroundTracingManager::GetInstance()->WhenIdle(
base::Bind(&DisableScenarioWhenIdle));
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698