Reverting 16158.

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

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

4 files changed, 2 insertions, 17 deletions

diff --git a/net/base/cookie_monster.cc b/net/base/cookie_monster.cc
index 7eb487e..470bfc2 100644
--- a/net/base/cookie_monster.cc
+++ b/net/base/cookie_monster.cc
@@ -711,10 +711,6 @@ bool CookieMonster::DeleteCookie(const std::string& domain,
   return false;
 }
 
-void CookieMonster::SetStore(PersistentCookieStore* store) {
-  store_ = store;
-}
-
 // Mozilla sorts on the path length (longest first), and then it
 // sorts by creation time (oldest first).
 // The RFC says the sort order for the domain attribute is undefined.
diff --git a/net/base/cookie_monster.h b/net/base/cookie_monster.h
index 69750e5..24db893 100644
--- a/net/base/cookie_monster.h
+++ b/net/base/cookie_monster.h
@@ -134,9 +134,6 @@ class CookieMonster {
                     const CanonicalCookie& cookie,
                     bool sync_to_store);
 
-  // Sets the store, possibly to null for session only cookies.
-  void SetStore(PersistentCookieStore* store);
-
   // Override the default list of schemes that are allowed to be set in
   // this cookie store.  Calling his overrides the value of
   // "enable_file_scheme_".
diff --git a/net/base/cookie_policy.cc b/net/base/cookie_policy.cc
index 8eb1179..d18db63 100644
--- a/net/base/cookie_policy.cc
+++ b/net/base/cookie_policy.cc
@@ -16,8 +16,6 @@ bool CookiePolicy::CanGetCookies(const GURL& url, const GURL& policy_url) {
       return true;
     case CookiePolicy::BLOCK_THIRD_PARTY_COOKIES:
       return true;
-    case CookiePolicy::SESSION_COOKIES:
-      return true;
     case CookiePolicy::BLOCK_ALL_COOKIES:
       return false;
     default:
@@ -35,8 +33,6 @@ bool CookiePolicy::CanSetCookie(const GURL& url, const GURL& policy_url) {
         return true;  // Empty policy URL should indicate a first-party request
       return net::RegistryControlledDomainService::SameDomainOrHost(url,
                                                                     policy_url);
-    case CookiePolicy::SESSION_COOKIES:
-      return true;
     case CookiePolicy::BLOCK_ALL_COOKIES:
       return false;
     default:
diff --git a/net/base/cookie_policy.h b/net/base/cookie_policy.h
index 6fa6002..89d490b 100644
--- a/net/base/cookie_policy.h
+++ b/net/base/cookie_policy.h
@@ -25,12 +25,11 @@ class CookiePolicy {
   enum Type {
     ALLOW_ALL_COOKIES = 0,      // do not perform any cookie blocking
     BLOCK_THIRD_PARTY_COOKIES,  // prevent third-party cookies from being sent
-    BLOCK_ALL_COOKIES,           // disable cookies
-    SESSION_COOKIES            // expire all cookies at end of session
+    BLOCK_ALL_COOKIES           // disable cookies
   };
 
   static bool ValidType(int32 type) {
-    return type >= ALLOW_ALL_COOKIES && type <= SESSION_COOKIES;
+    return type >= ALLOW_ALL_COOKIES && type <= BLOCK_ALL_COOKIES;
   }
 
   static Type FromInt(int32 type) {
@@ -41,9 +40,6 @@ class CookiePolicy {
   // preferences change.
   void SetType(Type type) { type_ = type; }
 
-  // Get the current policy.
-  Type GetType() const { return type_; }
-
   CookiePolicy();
 
  private: