| Index: content/browser/browsing_data/clear_site_data_throttle_browsertest.cc
|
| diff --git a/content/browser/browsing_data/clear_site_data_throttle_browsertest.cc b/content/browser/browsing_data/clear_site_data_throttle_browsertest.cc
|
| index a58561492c3cd622081b9af299e2f85643f81211..41cc3d49edd51fd3384f2b671d51ddab628ebb9d 100644
|
| --- a/content/browser/browsing_data/clear_site_data_throttle_browsertest.cc
|
| +++ b/content/browser/browsing_data/clear_site_data_throttle_browsertest.cc
|
| @@ -13,7 +13,7 @@
|
| #include "base/strings/stringprintf.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "content/browser/browsing_data/browsing_data_filter_builder_impl.h"
|
| -#include "content/browser/service_worker/service_worker_context_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/public/browser/browser_context.h"
|
| #include "content/public/browser/browsing_data_remover.h"
|
| @@ -113,7 +113,8 @@ class TestBrowsingDataRemoverDelegate : public MockBrowsingDataRemoverDelegate {
|
|
|
| // TODO(msramek): A class like this already exists in ServiceWorkerBrowserTest.
|
| // Consider extracting it to a test utils file.
|
| -class ServiceWorkerActivationObserver : public ServiceWorkerContextObserver {
|
| +class ServiceWorkerActivationObserver
|
| + : public ServiceWorkerContextCoreObserver {
|
| public:
|
| static void SignalActivation(ServiceWorkerContextWrapper* context,
|
| const base::Closure& callback) {
|
| @@ -129,7 +130,7 @@ class ServiceWorkerActivationObserver : public ServiceWorkerContextObserver {
|
|
|
| ~ServiceWorkerActivationObserver() override {}
|
|
|
| - // ServiceWorkerContextObserver overrides.
|
| + // ServiceWorkerContextCoreObserver overrides.
|
| void OnVersionStateChanged(int64_t version_id,
|
| ServiceWorkerVersion::Status) override {
|
| if (context_->GetLiveVersion(version_id)->status() ==
|
| @@ -140,7 +141,7 @@ class ServiceWorkerActivationObserver : public ServiceWorkerContextObserver {
|
| }
|
|
|
| ServiceWorkerContextWrapper* context_;
|
| - ScopedObserver<ServiceWorkerContextWrapper, ServiceWorkerContextObserver>
|
| + ScopedObserver<ServiceWorkerContextWrapper, ServiceWorkerContextCoreObserver>
|
| scoped_observer_;
|
| base::Closure callback_;
|
| };
|
|
|