Account for server vs host clock skew in cookie expiration times.

chrome/browser/browsing_data/browsing_data_cookie_helper.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"
 
 #include "utility"
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 121 matching lines @@
     AddCookie(frame_url, *add_cookie);
   }
 }
 
 void CannedBrowsingDataCookieHelper::AddChangedCookie(
     const GURL& frame_url,
     const GURL& url,
     const std::string& cookie_line,
     const net::CookieOptions& options) {
   base::Time creation_time = base::Time::Now();
+  base::Time server_time;
+  if (options.has_server_time())
+    server_time = options.server_time();
+  else
+    server_time = creation_time;
 
   net::ParsedCookie pc(cookie_line);
   if (!pc.IsValid())
     return;
 
   if (options.exclude_httponly() && pc.IsHttpOnly())
     return;
 
   std::string domain_string;
   if (pc.HasDomain())
     domain_string = pc.Domain();
   std::string cookie_domain;
   if (!net::cookie_util::GetCookieDomainWithString(url, domain_string,
                                                    &cookie_domain))
     return;
 
   std::string cookie_path = net::CanonicalCookie::CanonPath(url, pc);
   std::string mac_key = pc.HasMACKey() ? pc.MACKey() : std::string();
   std::string mac_algorithm = pc.HasMACAlgorithm() ?
       pc.MACAlgorithm() : std::string();
 
   base::Time cookie_expires =
-      net::CanonicalCookie::CanonExpiration(pc, creation_time);
+      net::CanonicalCookie::CanonExpiration(pc, creation_time, server_time);
 
   scoped_ptr<net::CanonicalCookie> cookie(
       new net::CanonicalCookie(url, pc.Name(), pc.Value(), cookie_domain,
                                cookie_path, mac_key, mac_algorithm,
                                creation_time, cookie_expires,
                                creation_time, pc.IsSecure(), pc.IsHttpOnly()));
   if (cookie.get())
     AddCookie(frame_url, *cookie);
 }
 
@@ skipping 85 matching lines @@
   // collecting cookies per origin in redirect chains.
   // TODO(markusheintz): A) Change the GetCookiesCount method to prevent
   // counting cookies multiple times if they are stored in multiple cookie
   // lists.  B) Replace the GetCookieFor method call below with:
   // "GetCookiesFor(frame_url.GetOrigin());"
   net::CookieList* cookie_list =
       GetCookiesFor(GURL(kGlobalCookieListURL));
   DeleteMatchingCookie(cookie, cookie_list);
   cookie_list->push_back(cookie);
 }