diff --git a/content/browser/browsing_data/browsing_data_browsertest_utils.cc b/content/browser/browsing_data/browsing_data_browsertest_utils.cc index 244c84cbe68f6f..14753d04f35220 100644 --- a/content/browser/browsing_data/browsing_data_browsertest_utils.cc +++ b/content/browser/browsing_data/browsing_data_browsertest_utils.cc @@ -60,9 +60,8 @@ ServiceWorkerActivationObserver::ServiceWorkerActivationObserver( ServiceWorkerContextWrapper* context, base::OnceClosure callback) : context_(context), - scoped_observer_(this), callback_(std::move(callback)) { - scoped_observer_.Add(context); + scoped_observation_.Observe(context); } ServiceWorkerActivationObserver::~ServiceWorkerActivationObserver() {} diff --git a/content/browser/browsing_data/browsing_data_browsertest_utils.h b/content/browser/browsing_data/browsing_data_browsertest_utils.h index 3c86676e71d92c..9b85c1be859c51 100644 --- a/content/browser/browsing_data/browsing_data_browsertest_utils.h +++ b/content/browser/browsing_data/browsing_data_browsertest_utils.h @@ -8,7 +8,7 @@ #include #include -#include "base/scoped_observer.h" +#include "base/scoped_observation.h" #include "content/browser/service_worker/service_worker_context_core_observer.h" #include "content/browser/service_worker/service_worker_context_wrapper.h" #include "net/test/embedded_test_server/embedded_test_server.h" @@ -41,8 +41,9 @@ class ServiceWorkerActivationObserver ServiceWorkerVersion::Status) override; ServiceWorkerContextWrapper* context_; - ScopedObserver - scoped_observer_; + base::ScopedObservation + scoped_observation_{this}; base::OnceClosure callback_; }; diff --git a/content/browser/browsing_data/browsing_data_remover_impl_unittest.cc b/content/browser/browsing_data/browsing_data_remover_impl_unittest.cc index 1ed56630a45d29..733f80bda2283b 100644 --- a/content/browser/browsing_data/browsing_data_remover_impl_unittest.cc +++ b/content/browser/browsing_data/browsing_data_remover_impl_unittest.cc @@ -22,6 +22,7 @@ #include "base/macros.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" +#include "base/scoped_observation.h" #include "base/single_thread_task_runner.h" #include "base/strings/strcat.h" #include "base/strings/utf_string_conversions.h" @@ -1353,8 +1354,8 @@ class MultipleTasksObserver { class Target : public BrowsingDataRemover::Observer { public: Target(MultipleTasksObserver* parent, BrowsingDataRemover* remover) - : parent_(parent), observer_(this) { - observer_.Add(remover); + : parent_(parent) { + observation_.Observe(remover); } ~Target() override = default; @@ -1364,8 +1365,8 @@ class MultipleTasksObserver { private: MultipleTasksObserver* parent_; - ScopedObserver - observer_; + base::ScopedObservation + observation_{this}; }; explicit MultipleTasksObserver(BrowsingDataRemover* remover) diff --git a/content/browser/browsing_data/clear_site_data_utils.cc b/content/browser/browsing_data/clear_site_data_utils.cc index f22a43a77e58ba..8ebda5e1f749e6 100644 --- a/content/browser/browsing_data/clear_site_data_utils.cc +++ b/content/browser/browsing_data/clear_site_data_utils.cc @@ -4,7 +4,7 @@ #include "content/public/browser/clear_site_data_utils.h" -#include "base/scoped_observer.h" +#include "base/scoped_observation.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/browsing_data_filter_builder.h" @@ -38,11 +38,10 @@ class SiteDataClearer : public BrowsingDataRemover::Observer { avoid_closing_connections_(avoid_closing_connections), callback_(std::move(callback)), pending_task_count_(0), - remover_(nullptr), - scoped_observer_(this) { + remover_(nullptr) { remover_ = BrowserContext::GetBrowsingDataRemover(browser_context); DCHECK(remover_); - scoped_observer_.Add(remover_); + scoped_observation_.Observe(remover_); } ~SiteDataClearer() override { @@ -129,8 +128,8 @@ class SiteDataClearer : public BrowsingDataRemover::Observer { base::OnceClosure callback_; int pending_task_count_; BrowsingDataRemover* remover_; - ScopedObserver - scoped_observer_; + base::ScopedObservation + scoped_observation_{this}; }; } // namespace