HostContentSettingsMap refactoring.

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
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
 #include "chrome/browser/content_settings/content_settings_pattern.h"
 #include "chrome/browser/content_settings/content_settings_observer.h"
-#include "chrome/browser/prefs/pref_change_registrar.h"
 #include "chrome/common/content_settings.h"
 #include "content/browser/browser_thread.h"
 #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 ExtensionService;
 class GURL;
 class PrefService;
 class Profile;
 
 class HostContentSettingsMap
     : public content_settings::Observer,
-      public NotificationObserver,
       public base::RefCountedThreadSafe<HostContentSettingsMap> {
  public:
   // TODO(markusheintz): I sold my soul to the devil on order to add this tuple.
   // I really want my soul back, so I really will change this ASAP.
   typedef Tuple4<ContentSettingsPattern,
                  ContentSettingsPattern,
                  ContentSetting,
                  std::string> PatternSettingSourceTuple;
   typedef std::vector<PatternSettingSourceTuple> SettingsForOneType;
 
@@ skipping 19 matching lines @@
   // require an resource identifier to be specified, the |resource_identifier|
   // must be non-empty.
   //
   // This may be called on any thread.
   ContentSetting GetContentSetting(
       const GURL& primary_url,
       const GURL& secondary_url,
       ContentSettingsType content_type,
       const std::string& resource_identifier) const;
 
-  // Gets the content setting for cookies. This takes the third party cookie
-  // flag into account, and therefore needs to know whether we read or write a
-  // cookie.
-  //
-  // This may be called on any thread.
-  ContentSetting GetCookieContentSetting(
-      const GURL& url,
-      const GURL& first_party_url,
-      bool setting_cookie) const;
-
   // Returns all ContentSettings which apply to the given URLs. For content
   // setting types that require an additional resource identifier, the default
   // content setting is returned.
   //
   // This may be called on any thread.
   ContentSettings GetContentSettings(
       const GURL& primary_url,
       const GURL& secondary_url) const;
 
   // For a given content type, returns all patterns with a non-default setting,
@@ skipping 41 matching lines @@
                           ContentSetting setting);
 
   // Clears all host-specific settings for one content type.
   //
   // This should only be called on the UI thread.
   void ClearSettingsForOneType(ContentSettingsType content_type);
 
   static bool IsSettingAllowedForType(ContentSetting setting,
                                       ContentSettingsType content_type);
 
-  // This setting trumps any host-specific settings.
-  bool BlockThirdPartyCookies() const { return block_third_party_cookies_; }
-  bool IsBlockThirdPartyCookiesManaged() const {
-    return is_block_third_party_cookies_managed_;
-  }
-
-  // Sets whether we block all third-party cookies. This method must not be
-  // invoked on an incognito map.
-  //
-  // This should only be called on the UI thread.
-  void SetBlockThirdPartyCookies(bool block);
-
   // Returns true if the default setting for the |content_type| is managed.
   bool IsDefaultContentSettingManaged(ContentSettingsType content_type) const;
 
   // Detaches the HostContentSettingsMap from all Profile-related objects like
   // PrefService. This methods needs to be called before destroying the Profile.
   // Afterwards, none of the methods above that should only be called on the UI
   // thread should be called anymore.
   void ShutdownOnUIThread();
 
   // content_settings::Observer implementation.
   virtual void OnContentSettingChanged(
       ContentSettingsPattern primary_pattern,
       ContentSettingsPattern secondary_pattern,
       ContentSettingsType content_type,
       std::string resource_identifier);
 
-  // NotificationObserver implementation.
-  virtual void Observe(int type,
-                       const NotificationSource& source,
-                       const NotificationDetails& details);
+  static bool ShouldAllowAllContent(const GURL& url,
+                                    ContentSettingsType content_type);
 
  private:
   friend class base::RefCountedThreadSafe<HostContentSettingsMap>;
+  friend class CookieSettings;
   friend class HostContentSettingsMapTest_NonDefaultSettings_Test;
 
   virtual ~HostContentSettingsMap();
 
   // Returns all non-default ContentSettings which apply to the given URLs. For
   // content setting types that require an additional resource identifier,
   // CONTENT_SETTING_DEFAULT is returned.
   //
   // This may be called on any thread.
   ContentSettings GetNonDefaultContentSettings(
@@ skipping 12 matching lines @@
       const GURL& secondary_url,
       ContentSettingsType content_type,
       const std::string& resource_identifier) const;
 
   ContentSetting GetContentSettingInternal(
       const GURL& primary_url,
       const GURL& secondary_url,
       ContentSettingsType content_type,
       const std::string& resource_identifier) const;
 
-  // Various migration methods (old cookie, popup and per-host data gets
-  // migrated to the new format).
-  void MigrateObsoleteCookiePref();
-
   // Weak; owned by the Profile.
   PrefService* prefs_;
 
-  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_