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

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=nhiroki@chromium.org

Bug: 1145565
Change-Id: Id873d944e6e92d743bba116816b1c3f7c0bcabf2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2526168
Commit-Queue: Sigurður Ásgeirsson <siggi@chromium.org>
Reviewed-by: Hiroki Nakagawa <nhiroki@chromium.org>
Auto-Submit: Sigurður Ásgeirsson <siggi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#825824}

content/browser/worker_host/dedicated_worker_host.cc

@@ -52,7 +52,6 @@ DedicatedWorkerHost::DedicatedWorkerHost(
     : service_(service),
       token_(token),
       worker_process_host_(worker_process_host),
-      scoped_process_host_observer_(this),
       creator_render_frame_host_id_(creator_render_frame_host_id),
       ancestor_render_frame_host_id_(ancestor_render_frame_host_id),
       creator_origin_(creator_origin),
@@ -66,7 +65,7 @@ DedicatedWorkerHost::DedicatedWorkerHost(
   DCHECK(worker_process_host_->IsInitializedAndNotDead());
   DCHECK(coep_reporter_);
 
-  scoped_process_host_observer_.Add(worker_process_host_);
+  scoped_process_host_observation_.Observe(worker_process_host_);
 
   service_->NotifyWorkerCreated(token_, worker_process_host_->GetID(),
                                 ancestor_render_frame_host_id_, this);

content/browser/worker_host/dedicated_worker_host.h

@@ -8,7 +8,7 @@
 #include <memory>
 
 #include "base/optional.h"
-#include "base/scoped_observer.h"
+#include "base/scoped_observation.h"
 #include "build/build_config.h"
 #include "content/browser/browser_interface_broker_impl.h"
 #include "content/public/browser/global_routing_id.h"
@@ -168,8 +168,8 @@ class DedicatedWorkerHost final : public RenderProcessHostObserver {
   // The RenderProcessHost that hosts this worker.
   RenderProcessHost* const worker_process_host_;
 
-  ScopedObserver<RenderProcessHost, RenderProcessHostObserver>
-      scoped_process_host_observer_;
+  base::ScopedObservation<RenderProcessHost, RenderProcessHostObserver>
+      scoped_process_host_observation_{this};
 
   // The ID of the frame that directly starts this worker. This is base::nullopt
   // when this worker is nested.

content/browser/worker_host/dedicated_worker_service_impl_unittest.cc

@@ -8,7 +8,7 @@
 #include <utility>
 
 #include "base/run_loop.h"
-#include "base/scoped_observer.h"
+#include "base/scoped_observation.h"
 #include "base/test/scoped_feature_list.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/browser/worker_host/dedicated_worker_host.h"
@@ -211,9 +211,11 @@ class TestDedicatedWorkerServiceObserver
 TEST_P(DedicatedWorkerServiceImplTest, DedicatedWorkerServiceObserver) {
   // Set up the observer.
   TestDedicatedWorkerServiceObserver observer;
-  ScopedObserver<DedicatedWorkerService, DedicatedWorkerService::Observer>
-      scoped_dedicated_worker_service_observer_(&observer);
-  scoped_dedicated_worker_service_observer_.Add(GetDedicatedWorkerService());
+  base::ScopedObservation<DedicatedWorkerService,
+                          DedicatedWorkerService::Observer>
+      scoped_dedicated_worker_service_observation_(&observer);
+  scoped_dedicated_worker_service_observation_.Observe(
+      GetDedicatedWorkerService());
 
   std::unique_ptr<TestWebContents> web_contents =
       CreateWebContents(GURL("http://example.com/"));

content/browser/worker_host/shared_worker_host.cc

@@ -113,7 +113,6 @@ SharedWorkerHost::SharedWorkerHost(SharedWorkerServiceImpl* service,
       worker_process_host_(worker_process_host),
       scoped_process_host_ref_(
           std::make_unique<ScopedProcessHostRef>(worker_process_host)),
-      scoped_process_host_observer_(this),
       next_connection_request_id_(1),
       devtools_handle_(std::make_unique<ScopedDevToolsHandle>(this)),
       ukm_source_id_(ukm::ConvertToSourceId(ukm::AssignNewSourceId(),
@@ -126,7 +125,7 @@ SharedWorkerHost::SharedWorkerHost(SharedWorkerServiceImpl* service,
   // when two clients call new SharedWorker() at around the same time.
   worker_receiver_ = worker_.BindNewPipeAndPassReceiver();
 
-  scoped_process_host_observer_.Add(worker_process_host_);
+  scoped_process_host_observation_.Observe(worker_process_host_);
 
   service_->NotifyWorkerCreated(token_, worker_process_host_->GetID(),
                                 devtools_handle_->dev_tools_token());

content/browser/worker_host/shared_worker_host.h

@@ -13,7 +13,7 @@
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
-#include "base/scoped_observer.h"
+#include "base/scoped_observation.h"
 #include "base/strings/string16.h"
 #include "base/unguessable_token.h"
 #include "content/browser/browser_interface_broker_impl.h"
@@ -227,8 +227,8 @@ class CONTENT_EXPORT SharedWorkerHost : public blink::mojom::SharedWorkerHost,
   std::unique_ptr<ScopedProcessHostRef> scoped_process_host_ref_;
 
   // Observe the destruction of |worker_process_host_|.
-  ScopedObserver<RenderProcessHost, RenderProcessHostObserver>
-      scoped_process_host_observer_;
+  base::ScopedObservation<RenderProcessHost, RenderProcessHostObserver>
+      scoped_process_host_observation_{this};
 
   int next_connection_request_id_;
 

content/browser/worker_host/shared_worker_service_impl_unittest.cc

@@ -13,7 +13,7 @@
 #include "base/containers/queue.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
-#include "base/scoped_observer.h"
+#include "base/scoped_observation.h"
 #include "build/build_config.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/browser/worker_host/mock_shared_worker.h"
@@ -1323,11 +1323,12 @@ class TestSharedWorkerServiceObserver : public SharedWorkerService::Observer {
 TEST_F(SharedWorkerServiceImplTest, Observer) {
   TestSharedWorkerServiceObserver observer;
 
-  ScopedObserver<SharedWorkerService, SharedWorkerService::Observer>
-      scoped_observer(&observer);
-  scoped_observer.Add(content::BrowserContext::GetDefaultStoragePartition(
-                          browser_context_.get())
-                          ->GetSharedWorkerService());
+  base::ScopedObservation<SharedWorkerService, SharedWorkerService::Observer>
+      scoped_observation(&observer);
+  scoped_observation.Observe(
+      content::BrowserContext::GetDefaultStoragePartition(
+          browser_context_.get())
+          ->GetSharedWorkerService());
 
   std::unique_ptr<TestWebContents> web_contents =
       CreateWebContents(GURL("http://example.com/"));
@@ -1433,11 +1434,12 @@ TEST_F(SharedWorkerServiceImplTest, EnumerateSharedWorkers) {
 TEST_F(SharedWorkerServiceImplTest, CollapseDuplicateNotifications) {
   TestSharedWorkerServiceObserver observer;
 
-  ScopedObserver<SharedWorkerService, SharedWorkerService::Observer>
-      scoped_observer(&observer);
-  scoped_observer.Add(content::BrowserContext::GetDefaultStoragePartition(
-                          browser_context_.get())
-                          ->GetSharedWorkerService());
+  base::ScopedObservation<SharedWorkerService, SharedWorkerService::Observer>
+      scoped_observation(&observer);
+  scoped_observation.Observe(
+      content::BrowserContext::GetDefaultStoragePartition(
+          browser_context_.get())
+          ->GetSharedWorkerService());
 
   const GURL kUrl("http://example.com/w.js");
   const char kName[] = "name";
@@ -1525,11 +1527,12 @@ TEST_F(SharedWorkerServiceImplTest, CollapseDuplicateNotifications) {
 TEST_F(SharedWorkerServiceImplTest, Observer_OnClientConnectionLost) {
   TestSharedWorkerServiceObserver observer;
 
-  ScopedObserver<SharedWorkerService, SharedWorkerService::Observer>
-      scoped_observer(&observer);
-  scoped_observer.Add(content::BrowserContext::GetDefaultStoragePartition(
-                          browser_context_.get())
-                          ->GetSharedWorkerService());
+  base::ScopedObservation<SharedWorkerService, SharedWorkerService::Observer>
+      scoped_observation(&observer);
+  scoped_observation.Observe(
+      content::BrowserContext::GetDefaultStoragePartition(
+          browser_context_.get())
+          ->GetSharedWorkerService());
 
   std::unique_ptr<TestWebContents> web_contents =
       CreateWebContents(GURL("http://example.com/"));