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

Unified Diff: content/browser/tracing/background_tracing_manager_impl.h

Issue 1148633007: Hooked the trace event argument whitelist up to the background_trace_manager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Moved tracing enabled callback to its own testing function Created 5 years, 7 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
Index: content/browser/tracing/background_tracing_manager_impl.h
diff --git a/content/browser/tracing/background_tracing_manager_impl.h b/content/browser/tracing/background_tracing_manager_impl.h
index fd1fd00ad9e4fe147d0861e37c1327448ab6b53b..1093ba614b6d4af09c26e481de43d0a986bf03d1 100644
--- a/content/browser/tracing/background_tracing_manager_impl.h
+++ b/content/browser/tracing/background_tracing_manager_impl.h
@@ -21,7 +21,7 @@ class BackgroundTracingManagerImpl : public content::BackgroundTracingManager {
bool SetActiveScenario(scoped_ptr<BackgroundTracingConfig>,
const ReceiveCallback&,
- bool) override;
+ DataFiltering data_filtering) override;
void WhenIdle(IdleCallback idle_callback) override;
void TriggerNamedEvent(TriggerHandle, StartedFinalizingCallback) override;
@@ -29,6 +29,8 @@ class BackgroundTracingManagerImpl : public content::BackgroundTracingManager {
void GetTriggerNameList(std::vector<std::string>* trigger_names) override;
void InvalidateTriggerHandlesForTesting() override;
+ void SetTracingEnabledCallbackForTesting(
+ const base::Closure& callback) override;
private:
BackgroundTracingManagerImpl();
@@ -74,6 +76,7 @@ class BackgroundTracingManagerImpl : public content::BackgroundTracingManager {
int trigger_handle_ids_;
IdleCallback idle_callback_;
+ base::Closure tracing_enabled_callback_for_testing_;
friend struct base::DefaultLazyInstanceTraits<BackgroundTracingManagerImpl>;

Powered by Google App Engine
This is Rietveld 408576698