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

Unified Diff: chrome/browser/tracing/chrome_tracing_delegate_browsertest.cc

Issue 1426803004: Made the NavigationTracingObserver always be active whenever background tracing is active (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@random_triggers
Patch Set: Created 5 years, 2 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 | chrome/browser/tracing/navigation_tracing.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/tracing/chrome_tracing_delegate_browsertest.cc
diff --git a/chrome/browser/tracing/chrome_tracing_delegate_browsertest.cc b/chrome/browser/tracing/chrome_tracing_delegate_browsertest.cc
index f31cd8e040f5a7d61d4a2fa0a1a264e5bb2d1b48..828b0c36cdda35cd86f2abb8ae92899f0e232bc8 100644
--- a/chrome/browser/tracing/chrome_tracing_delegate_browsertest.cc
+++ b/chrome/browser/tracing/chrome_tracing_delegate_browsertest.cc
@@ -228,14 +228,14 @@ class ChromeTracingDelegateBrowserTestOnStartup
IN_PROC_BROWSER_TEST_F(ChromeTracingDelegateBrowserTestOnStartup,
ScenarioSetFromFieldtrial) {
// We should reach this point without crashing.
- EXPECT_TRUE(content::BackgroundTracingManager::GetInstance()
- ->HasActiveScenarioForTesting());
+ EXPECT_TRUE(
+ content::BackgroundTracingManager::GetInstance()->HasActiveScenario());
}
IN_PROC_BROWSER_TEST_F(ChromeTracingDelegateBrowserTestOnStartup,
PRE_StartupTracingThrottle) {
- EXPECT_TRUE(content::BackgroundTracingManager::GetInstance()
- ->HasActiveScenarioForTesting());
+ EXPECT_TRUE(
+ content::BackgroundTracingManager::GetInstance()->HasActiveScenario());
// Simulate a trace upload.
PrefService* local_state = g_browser_process->local_state();
@@ -248,8 +248,8 @@ IN_PROC_BROWSER_TEST_F(ChromeTracingDelegateBrowserTestOnStartup,
StartupTracingThrottle) {
// The startup scenario should *not* be started, since not enough
// time has elapsed since the last upload (set in the PRE_ above).
- EXPECT_FALSE(content::BackgroundTracingManager::GetInstance()
- ->HasActiveScenarioForTesting());
+ EXPECT_FALSE(
+ content::BackgroundTracingManager::GetInstance()->HasActiveScenario());
}
} // namespace
« no previous file with comments | « no previous file | chrome/browser/tracing/navigation_tracing.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698