Explicitly ShutdownOnUIThread the HostContentSettingsMap when destroying the Profile.

chrome/browser/content_settings/host_content_settings_map.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Maps hostnames to custom content settings.  Written on the UI thread and read
 // on any thread.  One instance per profile.
 
 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_HOST_CONTENT_SETTINGS_MAP_H_
 #define CHROME_BROWSER_CONTENT_SETTINGS_HOST_CONTENT_SETTINGS_MAP_H_
 #pragma once
@@ skipping 14 matching lines @@
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 
 namespace content_settings {
 class DefaultProviderInterface;
 class ProviderInterface;
 }  // namespace content_settings
 
 class ContentSettingsDetails;
 class DictionaryValue;
+class ExtensionService;
 class GURL;
 class PrefService;
 class Profile;
 
 class HostContentSettingsMap
     : public NotificationObserver,
-      public base::RefCountedThreadSafe<HostContentSettingsMap,
-                                        BrowserThread::DeleteOnUIThread> {
+      public base::RefCountedThreadSafe<HostContentSettingsMap> {
  public:
   typedef Tuple3<ContentSettingsPattern, ContentSetting, std::string>
       PatternSettingSourceTriple;
   typedef std::vector<PatternSettingSourceTriple> SettingsForOneType;
 
-  explicit HostContentSettingsMap(Profile* profile);
+  HostContentSettingsMap(PrefService* prefs,
+                         ExtensionService* extension_service,
+                         bool incognito);
 
   static void RegisterUserPrefs(PrefService* prefs);
 
   // Returns the default setting for a particular content type.
   //
   // This may be called on any thread.
   ContentSetting GetDefaultContentSetting(
       ContentSettingsType content_type) const;
 
   // Returns the default settings for all content types.
@@ skipping 128 matching lines @@
   // Afterwards, none of the methods above that should only be called on the UI
   // thread should be called anymore.
   void ShutdownOnUIThread();
 
   // NotificationObserver implementation.
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
  private:
-  friend struct BrowserThread::DeleteOnThread<BrowserThread::UI>;
-  friend class DeleteTask<HostContentSettingsMap>;
+  friend class base::RefCountedThreadSafe<HostContentSettingsMap>;
 
   virtual ~HostContentSettingsMap();
 
   ContentSetting GetContentSettingInternal(
       const GURL& primary_url,
       const GURL& secondary_url,
       ContentSettingsType content_type,
       const std::string& resource_identifier) const;
 
-  void UnregisterObservers();
-
   // Various migration methods (old cookie, popup and per-host data gets
   // migrated to the new format).
-  void MigrateObsoleteCookiePref(PrefService* prefs);
+  void MigrateObsoleteCookiePref();
 
-  // The profile we're associated with.
-  Profile* profile_;
+  // Weak; owned by the Profile.
+  PrefService* prefs_;
 
-  NotificationRegistrar notification_registrar_;
   PrefChangeRegistrar pref_change_registrar_;
 
   // Whether this settings map is for an OTR session.
   bool is_off_the_record_;
 
   // Whether we are currently updating preferences, this is used to ignore
   // notifications from the preferences service that we triggered ourself.
   bool updating_preferences_;
 
   // Default content setting providers.
   std::vector<linked_ptr<content_settings::DefaultProviderInterface> >
       default_content_settings_providers_;
 
   // Content setting providers.
   std::vector<linked_ptr<content_settings::ProviderInterface> >
       content_settings_providers_;
 
   // Used around accesses to the following objects to guarantee thread safety.
   mutable base::Lock lock_;
 
   // Misc global settings.
   bool block_third_party_cookies_;
   bool is_block_third_party_cookies_managed_;
 
   DISALLOW_COPY_AND_ASSIGN(HostContentSettingsMap);
 };
 
 #endif  // CHROME_BROWSER_CONTENT_SETTINGS_HOST_CONTENT_SETTINGS_MAP_H_