Implement Reactive Configuration in Background Tracing

content/browser/tracing/background_tracing_manager_impl.h

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 ddca7ba8eec695111c7405e9fcd9217705c7cc49..26f144adf0e04ea27003f4bdaeb3d5476aec8b81 100644
--- a/content/browser/tracing/background_tracing_manager_impl.h
+++ b/content/browser/tracing/background_tracing_manager_impl.h
@@ -30,11 +30,13 @@ class BackgroundTracingManagerImpl : public content::BackgroundTracingManager {
 
   void InvalidateTriggerHandlesForTesting() override;
 
+  void FireTimerForTesting() override;
+
  private:
   BackgroundTracingManagerImpl();
   ~BackgroundTracingManagerImpl() override;
 
-  void EnableRecording(std::string category_filter_str);
+  void EnableRecording(std::string, base::trace_event::TraceRecordMode);
   void EnableRecordingIfConfigNeedsIt();
   void OnFinalizeStarted(scoped_refptr<base::RefCountedString>);
   void OnFinalizeComplete();
@@ -63,9 +65,27 @@ class BackgroundTracingManagerImpl : public content::BackgroundTracingManager {
     base::Callback<void(scoped_refptr<base::RefCountedString>)> done_callback_;
   };
 
+  class TracingTimer {
+   public:
+    TracingTimer(StartedFinalizingCallback);

[dsinclair, 2015/06/03 14:15:30]

nit: explicit TracingTimer(StartedFinalizingCallback);

[fmeawad, 2015/06/03 18:00:18]

Done.

+    ~TracingTimer();
+
+    void StartTimer();
+    void CancelTimer();
+
+    void FireTimerForTesting();
+
+   private:
+    void TracingTimerFired();
+
+    base::OneShotTimer<TracingTimer> tracing_timer_;
+    BackgroundTracingManager::StartedFinalizingCallback callback_;

[dsinclair, 2015/06/03 14:15:30]

nit: Why does this need the BackgroundTracingManager:: qualification but the
constructor didn't? Can we drop it here?

[fmeawad, 2015/06/03 18:00:18]

Done.

+  };
+
   scoped_ptr<content::BackgroundTracingConfig> config_;
   scoped_refptr<TraceDataEndpointWrapper> data_endpoint_wrapper_;
   std::map<TriggerHandle, std::string> trigger_handles_;
+  scoped_ptr<TracingTimer> tracing_timer_;
   ReceiveCallback receive_callback_;
 
   bool is_gathering_;