Remove NOTIFICATION_PROFILE_DESTROYED from ChromeExtensionMessageFilter

Bug: 268984
Change-Id: I1e4e34c663cfa2c2cc2d5d903ee506b7171c4881
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1869022Reviewed-by: Devlin <rdevlin.cronin@chromium.org>
Commit-Queue: Evan Stade <estade@chromium.org>
Cr-Commit-Position: refs/heads/master@{#708035}

chrome/browser/renderer_host/chrome_extension_message_filter.cc

@@ -15,14 +15,12 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/task/post_task.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/activity_log/activity_action_constants.h"
 #include "chrome/browser/extensions/activity_log/activity_actions.h"
 #include "chrome/browser/extensions/activity_log/activity_log.h"
 #include "chrome/browser/extensions/api/activity_log_private/activity_log_private_api.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
-#include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
@@ -67,9 +65,7 @@ ChromeExtensionMessageFilter::ChromeExtensionMessageFilter(
       extension_info_map_(
           extensions::ExtensionSystem::Get(profile)->info_map()) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  notification_registrar_.Add(this,
-                              chrome::NOTIFICATION_PROFILE_DESTROYED,
-                              content::Source<Profile>(profile));
+  observed_profiles_.Add(profile);
 }
 
 ChromeExtensionMessageFilter::~ChromeExtensionMessageFilter() {
@@ -234,12 +230,10 @@ void ChromeExtensionMessageFilter::OnAddEventToExtensionActivityLog(
   AddActionToExtensionActivityLog(profile_, activity_log_, action);
 }
 
-void ChromeExtensionMessageFilter::Observe(
-    int type,
-    const content::NotificationSource& source,
-    const content::NotificationDetails& details) {
-  DCHECK_EQ(chrome::NOTIFICATION_PROFILE_DESTROYED, type);
-  profile_ = NULL;
+void ChromeExtensionMessageFilter::OnProfileWillBeDestroyed(Profile* profile) {
+  DCHECK_EQ(profile_, profile);
+  observed_profiles_.Remove(profile_);
+  profile_ = nullptr;
   activity_log_ = nullptr;
 }
 

chrome/browser/renderer_host/chrome_extension_message_filter.h

@@ -9,13 +9,13 @@
 #include <vector>
 
 #include "base/macros.h"
+#include "base/scoped_observer.h"
 #include "base/sequenced_task_runner_helpers.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/profiles/profile_observer.h"
 #include "content/public/browser/browser_message_filter.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
 
-class Profile;
 struct ExtensionHostMsg_APIActionOrEvent_Params;
 struct ExtensionHostMsg_DOMAction_Params;
 
@@ -28,7 +28,7 @@ struct Message;
 // This class filters out incoming Chrome-specific IPC messages from the
 // extension process on the IPC thread.
 class ChromeExtensionMessageFilter : public content::BrowserMessageFilter,
-                                     public content::NotificationObserver {
+                                     public ProfileObserver {
  public:
   ChromeExtensionMessageFilter(int render_process_id, Profile* profile);
 
@@ -68,10 +68,8 @@ class ChromeExtensionMessageFilter : public content::BrowserMessageFilter,
       const std::string& extension_id,
       const ExtensionHostMsg_APIActionOrEvent_Params& params);
 
-  // content::NotificationObserver implementation.
-  void Observe(int type,
-               const content::NotificationSource& source,
-               const content::NotificationDetails& details) override;
+  // ProfileObserver:
+  void OnProfileWillBeDestroyed(Profile* profile) override;
 
   // Returns true if an action should be logged for the given extension.
   bool ShouldLogExtensionAction(const std::string& extension_id) const;
@@ -90,7 +88,7 @@ class ChromeExtensionMessageFilter : public content::BrowserMessageFilter,
 
   scoped_refptr<extensions::InfoMap> extension_info_map_;
 
-  content::NotificationRegistrar notification_registrar_;
+  ScopedObserver<Profile, ProfileObserver> observed_profiles_{this};
 
   DISALLOW_COPY_AND_ASSIGN(ChromeExtensionMessageFilter);
 };