Apply third party cookie blocking to all kinds of cookies

chrome/browser/content_settings/host_content_settings_map.h

Index: chrome/browser/content_settings/host_content_settings_map.h
diff --git a/chrome/browser/content_settings/host_content_settings_map.h b/chrome/browser/content_settings/host_content_settings_map.h
index 09b3500def05a7f85d35d810dcfb17411e70bdc6..68f4cad3f9567761fe92f094cc5909994f23b537 100644
--- a/chrome/browser/content_settings/host_content_settings_map.h
+++ b/chrome/browser/content_settings/host_content_settings_map.h
@@ -65,6 +65,16 @@ class HostContentSettingsMap
       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 a single ContentSetting which applies to a given URL or
   // CONTENT_SETTING_DEFAULT, if no exception applies. Note that certain
   // internal schemes are whitelisted. For ContentSettingsTypes that require an
@@ -169,6 +179,11 @@ class HostContentSettingsMap
 
   virtual ~HostContentSettingsMap();
 
+  ContentSetting GetContentSettingInternal(
+      const GURL& url,
+      ContentSettingsType content_type,
+      const std::string& resource_identifier) const;
+
   void UnregisterObservers();
 
   // Various migration methods (old cookie, popup and per-host data gets