Revert of Add EnabledStateObserver to BackgroundTracingManager

content/browser/tracing/background_tracing_manager_browsertest.cc

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 4bdc628560ee02e0354de105b68e39b043e51a4b..f2cfb53f73745a59b26e2d229cc6b5b5d0ed0d29 100644
--- a/content/browser/tracing/background_tracing_manager_browsertest.cc
+++ b/content/browser/tracing/background_tracing_manager_browsertest.cc
@@ -20,49 +20,6 @@
 #include "third_party/zlib/zlib.h"
 
 namespace content {
-namespace {
-
-class TestBackgroundTracingObserver
-    : public BackgroundTracingManagerImpl::EnabledStateObserver {
- public:
-  explicit TestBackgroundTracingObserver(
-      base::Closure tracing_enabled_callback);
-  ~TestBackgroundTracingObserver() override;
-
-  void OnScenarioActivated(const BackgroundTracingConfigImpl& config) override;
-  void OnTracingEnabled(
-      BackgroundTracingConfigImpl::CategoryPreset preset) override;
-
- private:
-  bool was_scenario_activated_;
-  base::Closure tracing_enabled_callback_;
-};
-
-TestBackgroundTracingObserver::TestBackgroundTracingObserver(
-    base::Closure tracing_enabled_callback)
-    : was_scenario_activated_(false),
-      tracing_enabled_callback_(tracing_enabled_callback) {
-  BackgroundTracingManagerImpl::GetInstance()->AddEnabledStateObserver(this);
-}
-
-TestBackgroundTracingObserver::~TestBackgroundTracingObserver() {
-  static_cast<BackgroundTracingManagerImpl*>(
-      BackgroundTracingManager::GetInstance())
-      ->RemoveEnabledStateObserver(this);
-  EXPECT_TRUE(was_scenario_activated_);
-}
-
-void TestBackgroundTracingObserver::OnScenarioActivated(
-    const BackgroundTracingConfigImpl& config) {
-  was_scenario_activated_ = true;
-}
-
-void TestBackgroundTracingObserver::OnTracingEnabled(
-    BackgroundTracingConfigImpl::CategoryPreset preset) {
-  tracing_enabled_callback_.Run();
-}
-
-}  // namespace
 
 class BackgroundTracingManagerBrowserTest : public ContentBrowserTest {
  public:
@@ -322,7 +279,8 @@
           "preemptive_test");
 
   base::RunLoop wait_for_activated;
-  TestBackgroundTracingObserver observer(wait_for_activated.QuitClosure());
+  BackgroundTracingManager::GetInstance()->SetTracingEnabledCallbackForTesting(
+      wait_for_activated.QuitClosure());
   EXPECT_TRUE(BackgroundTracingManager::GetInstance()->SetActiveScenario(
       std::move(config), upload_config_wrapper.get_receive_callback(),
       BackgroundTracingManager::ANONYMIZE_DATA));
@@ -372,7 +330,8 @@
           "preemptive_test");
 
   base::RunLoop wait_for_activated;
-  TestBackgroundTracingObserver observer(wait_for_activated.QuitClosure());
+  BackgroundTracingManager::GetInstance()->SetTracingEnabledCallbackForTesting(
+      wait_for_activated.QuitClosure());
   EXPECT_TRUE(BackgroundTracingManager::GetInstance()->SetActiveScenario(
       std::move(config), upload_config_wrapper.get_receive_callback(),
       BackgroundTracingManager::ANONYMIZE_DATA));
@@ -417,7 +376,8 @@
           "preemptive_test");
 
   base::RunLoop wait_for_activated;
-  TestBackgroundTracingObserver observer(wait_for_activated.QuitClosure());
+  BackgroundTracingManager::GetInstance()->SetTracingEnabledCallbackForTesting(
+      wait_for_activated.QuitClosure());
   EXPECT_TRUE(BackgroundTracingManager::GetInstance()->SetActiveScenario(
       std::move(config), upload_config_wrapper.get_receive_callback(),
       BackgroundTracingManager::ANONYMIZE_DATA));
@@ -1450,15 +1410,18 @@
         BackgroundTracingManager::GetInstance()->RegisterTriggerType(
             "reactive_test");
 
+    EXPECT_TRUE(BackgroundTracingManager::GetInstance()->SetActiveScenario(
+        std::move(config), upload_config_wrapper.get_receive_callback(),
+        BackgroundTracingManager::NO_DATA_FILTERING));
+
+    BackgroundTracingManager::GetInstance()->WhenIdle(
+        base::Bind(&DisableScenarioWhenIdle));
+
     base::RunLoop wait_for_tracing_enabled;
-    TestBackgroundTracingObserver observer(
-        wait_for_tracing_enabled.QuitClosure());
-    EXPECT_TRUE(BackgroundTracingManager::GetInstance()->SetActiveScenario(
-        std::move(config), upload_config_wrapper.get_receive_callback(),
-        BackgroundTracingManager::NO_DATA_FILTERING));
-
-    BackgroundTracingManager::GetInstance()->WhenIdle(
-        base::Bind(&DisableScenarioWhenIdle));
+    static_cast<BackgroundTracingManagerImpl*>(
+        BackgroundTracingManager::GetInstance())
+        ->SetTracingEnabledCallbackForTesting(
+            wait_for_tracing_enabled.QuitClosure());
 
     BackgroundTracingManager::GetInstance()->TriggerNamedEvent(
         trigger_handle,