Access-time threshold unit failure in CookieMonster.

net/cookies/cookie_monster_unittest.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 "net/cookies/cookie_store_unittest.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 1201 matching lines @@
   EXPECT_EQ(
       1, DeleteAllCreatedBetween(cm.get(), now - TimeDelta::FromDays(7), now));
 
   // Delete the last (now) item.
   EXPECT_EQ(1, DeleteAllCreatedBetween(cm.get(), Time(), Time()));
 
   // Really make sure everything is gone.
   EXPECT_EQ(0, DeleteAll(cm.get()));
 }
 
-static const int kAccessDelayMs = kLastAccessThresholdMilliseconds + 20;
+static const base::TimeDelta kLastAccessThreshold =
+    base::TimeDelta::FromMilliseconds(200);
+static const base::TimeDelta kAccessDelay =
+    kLastAccessThreshold + base::TimeDelta::FromMilliseconds(20);
 
 TEST_F(CookieMonsterTest, TestLastAccess) {
   scoped_ptr<CookieMonster> cm(
-      new CookieMonster(nullptr, nullptr, kLastAccessThresholdMilliseconds));
+      new CookieMonster(nullptr, nullptr, kLastAccessThreshold));
 
   EXPECT_TRUE(SetCookie(cm.get(), http_www_google_.url(), "A=B"));
   const Time last_access_date(GetFirstCookieAccessDate(cm.get()));
 
   // Reading the cookie again immediately shouldn't update the access date,
   // since we're inside the threshold.
   EXPECT_EQ("A=B", GetCookies(cm.get(), http_www_google_.url()));
   EXPECT_EQ(last_access_date, GetFirstCookieAccessDate(cm.get()));
 
   // Reading after a short wait will update the access date, if the cookie
   // is requested with options that would update the access date. First, test
   // that the flag's behavior is respected.
-  base::PlatformThread::Sleep(
-      base::TimeDelta::FromMilliseconds(kAccessDelayMs));
+  base::PlatformThread::Sleep(kAccessDelay);
   CookieOptions options;
   options.set_do_not_update_access_time();
   EXPECT_EQ("A=B",
             GetCookiesWithOptions(cm.get(), http_www_google_.url(), options));
   EXPECT_EQ(last_access_date, GetFirstCookieAccessDate(cm.get()));
 
   // Getting all cookies for a URL doesn't update the accessed time either.
   CookieList cookies = GetAllCookiesForURL(cm.get(), http_www_google_.url());
   CookieList::iterator it = cookies.begin();
   ASSERT_TRUE(it != cookies.end());
@@ skipping 31 matching lines @@
   GURL http_url("http://host/path");
 
   EXPECT_TRUE(SetCookie(cm.get(), http_url, "x=1"));
   EXPECT_FALSE(SetCookie(cm.get(), foo_url, "x=1"));
   EXPECT_TRUE(SetCookie(cm_foo.get(), foo_url, "x=1"));
   EXPECT_FALSE(SetCookie(cm_foo.get(), http_url, "x=1"));
 }
 
 TEST_F(CookieMonsterTest, GetAllCookiesForURL) {
   scoped_ptr<CookieMonster> cm(
-      new CookieMonster(nullptr, nullptr, kLastAccessThresholdMilliseconds));
+      new CookieMonster(nullptr, nullptr, kLastAccessThreshold));
 
   // Create an httponly cookie.
   CookieOptions options;
   options.set_include_httponly();
 
   EXPECT_TRUE(SetCookieWithOptions(cm.get(), http_www_google_.url(),
                                    "A=B; httponly", options));
   EXPECT_TRUE(SetCookieWithOptions(cm.get(), http_www_google_.url(),
                                    http_www_google_.Format("C=D; domain=.%D"),
                                    options));
   EXPECT_TRUE(SetCookieWithOptions(
       cm.get(), https_www_google_.url(),
       http_www_google_.Format("E=F; domain=.%D; secure"), options));
 
   const Time last_access_date(GetFirstCookieAccessDate(cm.get()));
 
-  base::PlatformThread::Sleep(
-      base::TimeDelta::FromMilliseconds(kAccessDelayMs));
+  base::PlatformThread::Sleep(kAccessDelay);
 
   // Check cookies for url.
   CookieList cookies = GetAllCookiesForURL(cm.get(), http_www_google_.url());
   CookieList::iterator it = cookies.begin();
 
   ASSERT_TRUE(it != cookies.end());
   EXPECT_EQ(http_www_google_.host(), it->Domain());
   EXPECT_EQ("A", it->Name());
 
   ASSERT_TRUE(++it != cookies.end());
@@ skipping 1875 matching lines @@
       monster()->AddCallbackForCookie(
           test_url_, "abc",
           base::Bind(&RecordCookieChanges, &cookies1, nullptr)));
   SetCookie(monster(), test_url_, "abc=def");
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(1U, cookies0.size());
   EXPECT_EQ(1U, cookies0.size());
 }
 
 }  // namespace net