Commit 52c63a52 authored by Sigurdur Asgeirsson's avatar Sigurdur Asgeirsson Committed by Commit Bot

Replace ScopedObserver with base::ScopedObservation in /content/browser/browsing_data.

ScopedObserver is being deprecated in favor of two new classes:
- base::ScopedObservation for observers that only ever observe
  a single source.
- base::ScopedMultiSourceObservation for observers that do or may
  observe more than a single source.
This CL was uploaded by git cl split.

R=msramek@chromium.org

Change-Id: I118ba2a88ecbbbe731ff98061c4e11c6255abcb1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2525764
Commit-Queue: Sigurður Ásgeirsson <siggi@chromium.org>
Commit-Queue: Martin Šrámek <msramek@chromium.org>
Auto-Submit: Sigurður Ásgeirsson <siggi@chromium.org>
Reviewed-by: default avatarMartin Šrámek <msramek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#825438}
parent 026b2d3c
...@@ -60,9 +60,8 @@ ServiceWorkerActivationObserver::ServiceWorkerActivationObserver( ...@@ -60,9 +60,8 @@ ServiceWorkerActivationObserver::ServiceWorkerActivationObserver(
ServiceWorkerContextWrapper* context, ServiceWorkerContextWrapper* context,
base::OnceClosure callback) base::OnceClosure callback)
: context_(context), : context_(context),
scoped_observer_(this),
callback_(std::move(callback)) { callback_(std::move(callback)) {
scoped_observer_.Add(context); scoped_observation_.Observe(context);
} }
ServiceWorkerActivationObserver::~ServiceWorkerActivationObserver() {} ServiceWorkerActivationObserver::~ServiceWorkerActivationObserver() {}
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#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_core_observer.h"
#include "content/browser/service_worker/service_worker_context_wrapper.h" #include "content/browser/service_worker/service_worker_context_wrapper.h"
#include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/embedded_test_server/embedded_test_server.h"
...@@ -41,8 +41,9 @@ class ServiceWorkerActivationObserver ...@@ -41,8 +41,9 @@ class ServiceWorkerActivationObserver
ServiceWorkerVersion::Status) override; ServiceWorkerVersion::Status) override;
ServiceWorkerContextWrapper* context_; ServiceWorkerContextWrapper* context_;
ScopedObserver<ServiceWorkerContextWrapper, ServiceWorkerContextCoreObserver> base::ScopedObservation<ServiceWorkerContextWrapper,
scoped_observer_; ServiceWorkerContextCoreObserver>
scoped_observation_{this};
base::OnceClosure callback_; base::OnceClosure callback_;
}; };
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include "base/macros.h" #include "base/macros.h"
#include "base/memory/ptr_util.h" #include "base/memory/ptr_util.h"
#include "base/run_loop.h" #include "base/run_loop.h"
#include "base/scoped_observation.h"
#include "base/single_thread_task_runner.h" #include "base/single_thread_task_runner.h"
#include "base/strings/strcat.h" #include "base/strings/strcat.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
...@@ -1353,8 +1354,8 @@ class MultipleTasksObserver { ...@@ -1353,8 +1354,8 @@ class MultipleTasksObserver {
class Target : public BrowsingDataRemover::Observer { class Target : public BrowsingDataRemover::Observer {
public: public:
Target(MultipleTasksObserver* parent, BrowsingDataRemover* remover) Target(MultipleTasksObserver* parent, BrowsingDataRemover* remover)
: parent_(parent), observer_(this) { : parent_(parent) {
observer_.Add(remover); observation_.Observe(remover);
} }
~Target() override = default; ~Target() override = default;
...@@ -1364,8 +1365,8 @@ class MultipleTasksObserver { ...@@ -1364,8 +1365,8 @@ class MultipleTasksObserver {
private: private:
MultipleTasksObserver* parent_; MultipleTasksObserver* parent_;
ScopedObserver<BrowsingDataRemover, BrowsingDataRemover::Observer> base::ScopedObservation<BrowsingDataRemover, BrowsingDataRemover::Observer>
observer_; observation_{this};
}; };
explicit MultipleTasksObserver(BrowsingDataRemover* remover) explicit MultipleTasksObserver(BrowsingDataRemover* remover)
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#include "content/public/browser/clear_site_data_utils.h" #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_context.h"
#include "content/public/browser/browser_thread.h" #include "content/public/browser/browser_thread.h"
#include "content/public/browser/browsing_data_filter_builder.h" #include "content/public/browser/browsing_data_filter_builder.h"
...@@ -38,11 +38,10 @@ class SiteDataClearer : public BrowsingDataRemover::Observer { ...@@ -38,11 +38,10 @@ class SiteDataClearer : public BrowsingDataRemover::Observer {
avoid_closing_connections_(avoid_closing_connections), avoid_closing_connections_(avoid_closing_connections),
callback_(std::move(callback)), callback_(std::move(callback)),
pending_task_count_(0), pending_task_count_(0),
remover_(nullptr), remover_(nullptr) {
scoped_observer_(this) {
remover_ = BrowserContext::GetBrowsingDataRemover(browser_context); remover_ = BrowserContext::GetBrowsingDataRemover(browser_context);
DCHECK(remover_); DCHECK(remover_);
scoped_observer_.Add(remover_); scoped_observation_.Observe(remover_);
} }
~SiteDataClearer() override { ~SiteDataClearer() override {
...@@ -129,8 +128,8 @@ class SiteDataClearer : public BrowsingDataRemover::Observer { ...@@ -129,8 +128,8 @@ class SiteDataClearer : public BrowsingDataRemover::Observer {
base::OnceClosure callback_; base::OnceClosure callback_;
int pending_task_count_; int pending_task_count_;
BrowsingDataRemover* remover_; BrowsingDataRemover* remover_;
ScopedObserver<BrowsingDataRemover, BrowsingDataRemover::Observer> base::ScopedObservation<BrowsingDataRemover, BrowsingDataRemover::Observer>
scoped_observer_; scoped_observation_{this};
}; };
} // namespace } // namespace
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment