Revert of Add EnabledStateObserver to BackgroundTracingManager

content/browser/tracing/background_tracing_manager_browsertest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/pattern.h"
 #include "base/trace_event/trace_event.h"
 #include "content/browser/tracing/background_tracing_manager_impl.h"
 #include "content/browser/tracing/background_tracing_rule.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 #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:
   BackgroundTracingManagerBrowserTest() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BackgroundTracingManagerBrowserTest);
 };
 
 class BackgroundTracingManagerUploadConfigWrapper {
@@ skipping 239 matching lines @@
   BackgroundTracingManagerUploadConfigWrapper upload_config_wrapper(
       wait_for_upload.QuitClosure());
 
   std::unique_ptr<BackgroundTracingConfig> config = CreatePreemptiveConfig();
 
   content::BackgroundTracingManager::TriggerHandle handle =
       content::BackgroundTracingManager::GetInstance()->RegisterTriggerType(
           "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));
 
   wait_for_activated.Run();
 
   TRACE_EVENT1("benchmark", "whitelisted", "find_this", 1);
   TRACE_EVENT1("benchmark", "not_whitelisted", "this_not_found", 1);
 
   BackgroundTracingManager::GetInstance()->WhenIdle(
@@ skipping 29 matching lines @@
   BackgroundTracingManagerUploadConfigWrapper upload_config_wrapper(
       wait_for_upload.QuitClosure());
 
   std::unique_ptr<BackgroundTracingConfig> config = CreatePreemptiveConfig();
 
   content::BackgroundTracingManager::TriggerHandle handle =
       content::BackgroundTracingManager::GetInstance()->RegisterTriggerType(
           "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));
 
   wait_for_activated.Run();
 
   BackgroundTracingManager::GetInstance()->WhenIdle(
       base::Bind(&DisableScenarioWhenIdle));
 
   BackgroundTracingManager::GetInstance()->TriggerNamedEvent(
@@ skipping 24 matching lines @@
   BackgroundTracingManagerUploadConfigWrapper upload_config_wrapper(
       wait_for_upload.QuitClosure());
 
   std::unique_ptr<BackgroundTracingConfig> config = CreatePreemptiveConfig();
 
   content::BackgroundTracingManager::TriggerHandle handle =
       content::BackgroundTracingManager::GetInstance()->RegisterTriggerType(
           "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));
 
   wait_for_activated.Run();
 
   NavigateToURL(shell(), GetTestUrl("", "about:blank"));
 
   BackgroundTracingManager::GetInstance()->WhenIdle(
       base::Bind(&DisableScenarioWhenIdle));
@@ skipping 1012 matching lines @@
     }
     dict.Set("configs", std::move(rules_list));
 
     std::unique_ptr<BackgroundTracingConfig> config(
         BackgroundTracingConfigImpl::FromDict(&dict));
 
     BackgroundTracingManager::TriggerHandle trigger_handle =
         BackgroundTracingManager::GetInstance()->RegisterTriggerType(
             "reactive_test");
 
-    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));
 
+    base::RunLoop wait_for_tracing_enabled;
+    static_cast<BackgroundTracingManagerImpl*>(
+        BackgroundTracingManager::GetInstance())
+        ->SetTracingEnabledCallbackForTesting(
+            wait_for_tracing_enabled.QuitClosure());
+
     BackgroundTracingManager::GetInstance()->TriggerNamedEvent(
         trigger_handle,
         base::Bind(&StartedFinalizingCallback, base::Closure(), true));
 
     wait_for_tracing_enabled.Run();
 
     // This is expected to fail since we already triggered.
     BackgroundTracingManager::GetInstance()->TriggerNamedEvent(
         trigger_handle,
         base::Bind(&StartedFinalizingCallback, base::Closure(), false));
 
     // Since we specified a delay in the scenario, we should still be tracing
     // at this point.
     EXPECT_TRUE(
         BackgroundTracingManagerImpl::GetInstance()->IsTracingForTesting());
 
     BackgroundTracingManager::GetInstance()->FireTimerForTesting();
 
     EXPECT_FALSE(
         BackgroundTracingManagerImpl::GetInstance()->IsTracingForTesting());
 
     run_loop.Run();
 
     EXPECT_TRUE(upload_config_wrapper.get_receive_count() == 1);
   }
 }
 
 }  // namespace content