Implement backend support for forcing cookies to be saved as

session cookies.

Introduces a new CookiePolicy result code OK_FOR_SESSION_ONLY.

R=eroman
BUG=34571
TEST=none

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

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

3 files changed, 44 insertions, 7 deletions

diff --git a/net/base/cookie_monster.cc b/net/base/cookie_monster.cc
index 6cda7e5..595bf06 100644
--- a/net/base/cookie_monster.cc
+++ b/net/base/cookie_monster.cc
@@ -361,7 +361,11 @@ static std::string CanonPath(const GURL& url,
 }
 
 static Time CanonExpiration(const CookieMonster::ParsedCookie& pc,
-                            const Time& current) {
+                            const Time& current,
+                            const CookieOptions& options) {
+  if (options.force_session())
+    return Time();
+
   // First, try the Max-Age attribute.
   uint64 max_age = 0;
   if (pc.HasMaxAge() &&
@@ -445,7 +449,7 @@ bool CookieMonster::SetCookieWithCreationTimeAndOptions(
   std::string cookie_path = CanonPath(url, pc);
 
   scoped_ptr<CanonicalCookie> cc;
-  Time cookie_expires = CanonExpiration(pc, creation_time);
+  Time cookie_expires = CanonExpiration(pc, creation_time, options);
 
   cc.reset(new CanonicalCookie(pc.Name(), pc.Value(), cookie_path,
                                pc.IsSecure(), pc.IsHttpOnly(),
diff --git a/net/base/cookie_options.h b/net/base/cookie_options.h
index e9301fe..9995a05 100644
--- a/net/base/cookie_options.h
+++ b/net/base/cookie_options.h
@@ -14,12 +14,22 @@ class CookieOptions {
   // Default is to exclude httponly, which means:
   // - reading operations will not return httponly cookies.
   // - writing operations will not write httponly cookies.
-  CookieOptions() : exclude_httponly_(true) {}
+  CookieOptions()
+      : exclude_httponly_(true),
+        force_session_(false) {
+  }
+
   void set_exclude_httponly() { exclude_httponly_ = true; }
   void set_include_httponly() { exclude_httponly_ = false; }
   bool exclude_httponly() const { return exclude_httponly_; }
+
+  // Forces a cookie to be saved as a session cookie.
+  void set_force_session() { force_session_ = true; }
+  bool force_session() const { return force_session_; }
+
  private:
   bool exclude_httponly_;
+  bool force_session_;
 };
 }  // namespace net
 
diff --git a/net/base/cookie_policy.h b/net/base/cookie_policy.h
index d2df2f5..f502e64d 100644
--- a/net/base/cookie_policy.h
+++ b/net/base/cookie_policy.h
@@ -11,12 +11,22 @@ class GURL;
 
 namespace net {
 
+// Alternative success codes for CookiePolicy::Can{Get,Set}Cookie(s).
+enum {
+  OK_FOR_SESSION_ONLY = 1,  // The cookie may be set but not persisted.
+};
+
 class CookiePolicy {
  public:
-  // Determines if the URL's cookies may be read.  Returns OK if allowed to
-  // read cookies for the given URL.  Returns ERR_IO_PENDING to indicate that
-  // the completion callback will be notified (asynchronously and on the
-  // current thread) of the final result.  Note: The completion callback must
+  // Determines if the URL's cookies may be read.
+  //
+  // Returns:
+  //   OK                   -  if allowed to read cookies
+  //   ERR_ACCESS_DENIED    -  if not allowed to read cookies
+  //   ERR_IO_PENDING       -  if the result will be determined asynchronously
+  //
+  // If the return value is ERR_IO_PENDING, then the given callback will be
+  // notified once the final result is determined.  Note: The callback must
   // remain valid until notified.
   virtual int CanGetCookies(const GURL& url,
                             const GURL& first_party_for_cookies,
@@ -27,6 +37,19 @@ class CookiePolicy {
   // the completion callback will be notified (asynchronously and on the
   // current thread) of the final result.  Note: The completion callback must
   // remain valid until notified.
+
+  // Determines if the URL's cookies may be written.
+  //
+  // Returns:
+  //   OK                   -  if allowed to write cookies
+  //   OK_FOR_SESSION_ONLY  -  if allowed to write cookies, but forces them to
+  //                           be stored as session cookies
+  //   ERR_ACCESS_DENIED    -  if not allowed to write cookies
+  //   ERR_IO_PENDING       -  if the result will be determined asynchronously
+  //
+  // If the return value is ERR_IO_PENDING, then the given callback will be
+  // notified once the final result is determined.  Note: The callback must
+  // remain valid until notified.
   virtual int CanSetCookie(const GURL& url,
                            const GURL& first_party_for_cookies,
                            const std::string& cookie_line,