Change function signature in ExtensionHostObserver

Remove constness of the ExtensionHostObserver passed in
OnExtensionHostDestroyed.
This allows scoped observers to stop observing a host that is getting
destroyed.

Fixed: 1086475
Change-Id: I9abc696fe164f26b4927cd7366e1cd04570dbe43
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2216211Reviewed-by: Devlin <rdevlin.cronin@chromium.org>
Reviewed-by: Alexander Alekseev <alemate@chromium.org>
Commit-Queue: Fabian Sommer <fabiansommer@chromium.org>
Cr-Commit-Position: refs/heads/master@{#775228}

chrome/browser/chromeos/login/challenge_response_auth_keys_loader.cc

@@ -228,10 +228,9 @@ class ExtensionLoadObserver final
 
   // extensions::ExtensionHostObserver
 
-  void OnExtensionHostDestroyed(
-      const extensions::ExtensionHost* host) override {
-    // TODO(crbug.com/1086475): Just stop observing |host| instead of all.
-    extension_host_observer_.RemoveAll();
+  void OnExtensionHostDestroyed(extensions::ExtensionHost* host) override {
+    DCHECK(extension_host_observer_.IsObserving(host));
+    extension_host_observer_.Remove(host);
     StopWaitingOnExtension(host->extension_id());
   }
 

chrome/browser/chromeos/power/extension_event_observer.cc

@@ -123,7 +123,7 @@ void ExtensionEventObserver::OnProcessManagerShutdown(
 }
 
 void ExtensionEventObserver::OnExtensionHostDestroyed(
-    const extensions::ExtensionHost* host) {
+    extensions::ExtensionHost* host) {
   auto it = keepalive_sources_.find(host);
   DCHECK(it != keepalive_sources_.end());
 

chrome/browser/chromeos/power/extension_event_observer.h

@@ -82,7 +82,7 @@ class ExtensionEventObserver : public ProfileManagerObserver,
   void OnProcessManagerShutdown(extensions::ProcessManager* manager) override;
 
   // extensions::ExtensionHostObserver:
-  void OnExtensionHostDestroyed(const extensions::ExtensionHost* host) override;
+  void OnExtensionHostDestroyed(extensions::ExtensionHost* host) override;
   void OnBackgroundEventDispatched(const extensions::ExtensionHost* host,
                                    const std::string& event_name,
                                    int event_id) override;

chrome/browser/extensions/api/extension_action/browser_action_apitest.cc

@@ -806,13 +806,9 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, CloseBackgroundPage) {
         const ExtensionHostDestructionObserver& other) = delete;
     ~ExtensionHostDestructionObserver() override = default;
 
-    void OnExtensionHostDestroyed(const ExtensionHost* host) override {
-      // TODO(devlin): It would be nice to
-      // ASSERT_TRUE(host_observer_.IsObserving(host));
-      // host_observer_.Remove(host);
-      // But we can't, because |host| is const. Work around it by just
-      // RemoveAll()ing.
-      host_observer_.RemoveAll();
+    void OnExtensionHostDestroyed(ExtensionHost* host) override {
+      ASSERT_TRUE(host_observer_.IsObserving(host));
+      host_observer_.Remove(host);
       run_loop_.QuitWhenIdle();
     }
 

chrome/browser/extensions/api/management/management_browsertest.cc

@@ -87,8 +87,7 @@ class ExtensionHostDestructionObserver
   }
 
   // ExtensionHostObserver:
-  void OnExtensionHostDestroyed(
-      const extensions::ExtensionHost* host) override {
+  void OnExtensionHostDestroyed(extensions::ExtensionHost* host) override {
     if (host == host_) {
       extension_host_observer_.Remove(host_);
       run_loop_.Quit();

chrome/browser/ui/extensions/extension_action_view_controller.cc

@@ -292,7 +292,7 @@ void ExtensionActionViewController::OnIconUpdated() {
 }
 
 void ExtensionActionViewController::OnExtensionHostDestroyed(
-    const extensions::ExtensionHost* host) {
+    extensions::ExtensionHost* host) {
   OnPopupClosed();
 }
 

chrome/browser/ui/extensions/extension_action_view_controller.h

@@ -105,7 +105,7 @@ class ExtensionActionViewController
   void OnIconUpdated() override;
 
   // ExtensionHostObserver:
-  void OnExtensionHostDestroyed(const extensions::ExtensionHost* host) override;
+  void OnExtensionHostDestroyed(extensions::ExtensionHost* host) override;
 
   // Checks if the associated |extension| is still valid by checking its
   // status in the registry. Since the OnExtensionUnloaded() notifications are

extensions/browser/extension_host_observer.h

@@ -21,7 +21,7 @@ class ExtensionHostObserver {
   // ExtensionHost it's given.
 
   // Called when an ExtensionHost is destroyed.
-  virtual void OnExtensionHostDestroyed(const ExtensionHost* host) {}
+  virtual void OnExtensionHostDestroyed(ExtensionHost* host) {}
 
   // Called when the ExtensionHost has finished the first load.
   virtual void OnExtensionHostDidStopFirstLoad(const ExtensionHost* host) {}

extensions/test/extension_background_page_waiter.cc

@@ -108,14 +108,15 @@ void ExtensionBackgroundPageWaiter::OnExtensionHostDidStopFirstLoad(
 }
 
 void ExtensionBackgroundPageWaiter::OnExtensionHostDestroyed(
-    const ExtensionHost* host) {
+    ExtensionHost* host) {
   // This is only called while we're waiting for the host to be ready (since
   // we remove ourselves as an observer when it's done).
   DCHECK(host_ready_run_loop_.running());
   ASSERT_EQ(extension_->id(), host->extension_id());
   ADD_FAILURE() << "Extension host for " << extension_->name()
                 << "was destroyed before it finished loading.";
-  extension_host_observer_.RemoveAll();
+  ASSERT_TRUE(extension_host_observer_.IsObserving(host));
+  extension_host_observer_.Remove(host);
 }
 
 }  // namespace extensions

extensions/test/extension_background_page_waiter.h

@@ -51,7 +51,7 @@ class ExtensionBackgroundPageWaiter : public ProcessManagerObserver,
 
   // ExtensionHostObserver:
   void OnExtensionHostDidStopFirstLoad(const ExtensionHost* host) override;
-  void OnExtensionHostDestroyed(const ExtensionHost* host) override;
+  void OnExtensionHostDestroyed(ExtensionHost* host) override;
 
   content::BrowserContext* const browser_context_;
   scoped_refptr<const Extension> extension_;