Get rid of Chrome notifications dependency, and instead go through ContentBrowserClient to show U...

chrome/browser/profiles/profile_io_data.h

Index: chrome/browser/profiles/profile_io_data.h
===================================================================
--- chrome/browser/profiles/profile_io_data.h	(revision 88079)
+++ chrome/browser/profiles/profile_io_data.h	(working copy)
@@ -23,13 +23,17 @@
 class CommandLine;
 class ChromeAppCacheService;
 class ChromeBlobStorageContext;
+class DesktopNotificationService;
 class ExtensionInfoMap;
+class HostContentSettingsMap;
+class HostZoomMap;
+class IOThread;
+class ProtocolHandlerRegistry;
+
 namespace fileapi {
 class FileSystemContext;
 }  // namespace fileapi
-class HostContentSettingsMap;
-class HostZoomMap;
-class IOThread;
+
 namespace net {
 class DnsCertProvenanceChecker;
 class NetLog;
@@ -38,13 +42,15 @@
 class SSLConfigService;
 class TransportSecurityState;
 }  // namespace net
+
 namespace prerender {
 class PrerenderManager;
 };  // namespace prerender
-class ProtocolHandlerRegistry;
+
 namespace quota {
 class QuotaManager;
 };  // namespace quota
+
 namespace webkit_database {
 class DatabaseTracker;
 }  // webkit_database
@@ -86,7 +92,9 @@
   // These are useful when the Chrome layer is called from the content layer
   // with a content::ResourceContext, and they want access to Chrome data for
   // that profile.
+  ExtensionInfoMap* GetExtensionInfoMap() const;
   HostContentSettingsMap* GetHostContentSettingsMap() const;
+  DesktopNotificationService* GetNotificationService() const;
 
  protected:
   friend class base::RefCountedThreadSafe<ProfileIOData>;
@@ -128,6 +136,7 @@
     scoped_refptr<fileapi::FileSystemContext> file_system_context;
     scoped_refptr<quota::QuotaManager> quota_manager;
     scoped_refptr<ExtensionInfoMap> extension_info_map;
+    DesktopNotificationService* notification_service;
     base::WeakPtr<prerender::PrerenderManager> prerender_manager;
     scoped_refptr<ProtocolHandlerRegistry> protocol_handler_registry;
     // We need to initialize the ProxyConfigService from the UI thread
@@ -247,8 +256,9 @@
   mutable scoped_refptr<HostZoomMap> host_zoom_map_;
 
   // TODO(willchan): Remove from ResourceContext.
+  mutable scoped_refptr<ExtensionInfoMap> extension_info_map_;
   mutable scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
-  mutable scoped_refptr<ExtensionInfoMap> extension_info_map_;
+  mutable DesktopNotificationService* notification_service_;

[willchan no longer on Chromium, 2011/06/28 09:08:40]

Isn't this a bug? DesktopNotificationService is owned and destroyed on the UI
thread when the ProfileManager is destroyed, which is before the IO thread is
stopped. Does this lead to shutdown use-after-free?

   mutable base::WeakPtr<prerender::PrerenderManager> prerender_manager_;
 
   mutable ResourceContext resource_context_;