summaryrefslogtreecommitdiffstats
path: root/net/cookies/canonical_cookie.h
diff options
context:
space:
mode:
authorerikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-02 13:18:42 +0000
committererikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-02 13:18:42 +0000
commitea0710a82bbd85d450cf8aad9e2d413757bf4832 (patch)
treec7782d919dd470b06864eef1a4fd46d2e21cfb10 /net/cookies/canonical_cookie.h
parent8df601213f42259a0aae9d2e040f0740b2c17945 (diff)
downloadchromium_src-ea0710a82bbd85d450cf8aad9e2d413757bf4832.zip
chromium_src-ea0710a82bbd85d450cf8aad9e2d413757bf4832.tar.gz
chromium_src-ea0710a82bbd85d450cf8aad9e2d413757bf4832.tar.bz2
Revert 146616.
Account for server vs host clock skew in cookie expiration times. When setting a cookie's expiration time in the cookie store we need to take into account any difference between the HTTP server and the host machine's real time clock. BUG=135131 TEST=net_unittests --gtest_filter=CookieMonster/CookieStoreTest/0.TestCookieDeletion Review URL: https://chromiumcodereview.appspot.com/10692137 R=pauljensen@chromium.org,szym@chromium.org BUG=152078 Review URL: https://chromiumcodereview.appspot.com/11036007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159685 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/cookies/canonical_cookie.h')
-rw-r--r--net/cookies/canonical_cookie.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/cookies/canonical_cookie.h b/net/cookies/canonical_cookie.h
index ba50dfc..1b1ca77 100644
--- a/net/cookies/canonical_cookie.h
+++ b/net/cookies/canonical_cookie.h
@@ -117,8 +117,7 @@ class NET_EXPORT CanonicalCookie {
static std::string GetCookieSourceFromURL(const GURL& url);
static std::string CanonPath(const GURL& url, const ParsedCookie& pc);
static base::Time CanonExpiration(const ParsedCookie& pc,
- const base::Time& current,
- const base::Time& server_time);
+ const base::Time& current);
private:
// The source member of a canonical cookie is the origin of the URL that tried