Apply third party cookie blocking to all kinds of cookies

BUG=72586
TEST=HostContentSettingsMapTest.Cookies*


Review URL: http://codereview.chromium.org/7008025

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86820 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 5 insertions, 8 deletions

diff --git a/net/base/static_cookie_policy.cc b/net/base/static_cookie_policy.cc
index 9e0dce7..9c4bbcf 100644
--- a/net/base/static_cookie_policy.cc
+++ b/net/base/static_cookie_policy.cc
@@ -31,9 +31,9 @@ int StaticCookiePolicy::CanGetCookies(
   }
 }
 
-int StaticCookiePolicy::CanSetCookie(const GURL& url,
-                                     const GURL& first_party_for_cookies,
-                                     const std::string& cookie_line) const {
+int StaticCookiePolicy::CanSetCookie(
+    const GURL& url,
+    const GURL& first_party_for_cookies) const {
   switch (type_) {
     case StaticCookiePolicy::ALLOW_ALL_COOKIES:
       return OK;
diff --git a/net/base/static_cookie_policy.h b/net/base/static_cookie_policy.h
index 2eb4d49..99a929c 100644
--- a/net/base/static_cookie_policy.h
+++ b/net/base/static_cookie_policy.h
@@ -6,8 +6,6 @@
 #define NET_BASE_STATIC_COOKIE_POLICY_H_
 #pragma once
 
-#include <string>
-
 #include "base/basictypes.h"
 #include "net/base/net_api.h"
 
@@ -52,8 +50,7 @@ class NET_API StaticCookiePolicy {
   // Consults the user's third-party cookie blocking preferences to determine
   // whether the URL's cookies can be set.
   int CanSetCookie(const GURL& url,
-                   const GURL& first_party_for_cookies,
-                   const std::string& cookie_line) const;
+                   const GURL& first_party_for_cookies) const;
 
  private:
   Type type_;
diff --git a/net/base/static_cookie_policy_unittest.cc b/net/base/static_cookie_policy_unittest.cc
index f701ceb..3d4e046 100644
--- a/net/base/static_cookie_policy_unittest.cc
+++ b/net/base/static_cookie_policy_unittest.cc
@@ -24,7 +24,7 @@ class StaticCookiePolicyTest : public testing::Test {
     return policy_.CanGetCookies(url, first_party);
   }
   int CanSetCookie(const GURL& url, const GURL& first_party) {
-    return policy_.CanSetCookie(url, first_party, std::string());
+    return policy_.CanSetCookie(url, first_party);
   }
  protected:
   StaticCookiePolicy policy_;