Add cookie priority to the cookie database.

content/browser/net/sqlite_persistent_cookie_store_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 "content/browser/net/sqlite_persistent_cookie_store.h"
 
 #include <map>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 313 matching lines @@
 
   // Create a store that loads session cookies and test that the session cookie
   // was loaded.
   CanonicalCookieVector cookies;
   CreateAndLoad(true, &cookies);
 
   ASSERT_EQ(1U, cookies.size());
   ASSERT_STREQ("sessioncookie.com", cookies[0]->Domain().c_str());
   ASSERT_STREQ("C", cookies[0]->Name().c_str());
   ASSERT_STREQ("D", cookies[0]->Value().c_str());
+  ASSERT_EQ(net::PRIORITY_DEFAULT, cookies[0]->Priority());
 
   STLDeleteElements(&cookies);
 }
 
 // Test loading old session cookies from the disk.
 TEST_F(SQLitePersistentCookieStoreTest, TestDontLoadOldSessionCookies) {
   InitializeStore(true);
 
   // Add a session cookie.
   store_->AddCookie(
@@ skipping 29 matching lines @@
   // Add a session cookie.
   store_->AddCookie(
       net::CanonicalCookie(
           GURL(), kSessionName, "val", "sessioncookie.com", "/",
           base::Time::Now(), base::Time(), base::Time::Now(), false, false,
           net::PRIORITY_DEFAULT));
   // Add a persistent cookie.
   store_->AddCookie(
       net::CanonicalCookie(
           GURL(), kPersistentName, "val", "sessioncookie.com", "/",
-          base::Time::Now() - base::TimeDelta::FromDays(1), base::Time::Now(),
+          base::Time::Now() - base::TimeDelta::FromDays(1),
+          base::Time::Now() + base::TimeDelta::FromDays(1),
           base::Time::Now(), false, false,
           net::PRIORITY_DEFAULT));
 
-  // Create a store that loads session cookie and test that the the IsPersistent
+  // Force the store to write its data to the disk.
+  DestroyStore();

[Roger McFarlane (Chromium), 2013/04/18 18:54:29]

This seemed to be missing from the test (on comparison to other tests in this
file).

+
+  // Create a store that loads session cookie and test that the IsPersistent
   // attribute is restored.
   CanonicalCookieVector cookies;
   CreateAndLoad(true, &cookies);
   ASSERT_EQ(2U, cookies.size());
 
   std::map<std::string, net::CanonicalCookie*> cookie_map;
   for (CanonicalCookieVector::const_iterator it = cookies.begin();
        it != cookies.end();
        ++it) {
     cookie_map[(*it)->Name()] = *it;
   }
 
   std::map<std::string, net::CanonicalCookie*>::const_iterator it =
       cookie_map.find(kSessionName);
   ASSERT_TRUE(it != cookie_map.end());
   EXPECT_FALSE(cookie_map[kSessionName]->IsPersistent());
 
   it = cookie_map.find(kPersistentName);
   ASSERT_TRUE(it != cookie_map.end());
   EXPECT_TRUE(cookie_map[kPersistentName]->IsPersistent());
 
   STLDeleteElements(&cookies);
 }
 
+TEST_F(SQLitePersistentCookieStoreTest, PriorityIsPersistent) {
+  static const char kLowName[] = "low";
+  static const char kMediumName[] = "medium";
+  static const char kHighName[] = "high";
+  static const char kDefaultName[] = "default";
+  static const char kCookieDomain[] = "sessioncookie.com";
+  static const char kCookieValue[] = "value";
+  static const char kCookiePath[] = "/";
+
+  InitializeStore(true);
+
+  // Add a low-priority persistent cookie.
+  store_->AddCookie(
+      net::CanonicalCookie(
+          GURL(), kLowName, kCookieValue, kCookieDomain, kCookiePath,
+          base::Time::Now() - base::TimeDelta::FromMinutes(1),
+          base::Time::Now() + base::TimeDelta::FromDays(1),
+          base::Time::Now(), false, false,
+          net::PRIORITY_LOW));
+
+  // Add a medium-priority persistent cookie.
+  store_->AddCookie(
+      net::CanonicalCookie(
+          GURL(), kMediumName, kCookieValue, kCookieDomain, kCookiePath,
+          base::Time::Now() - base::TimeDelta::FromMinutes(2),
+          base::Time::Now() + base::TimeDelta::FromDays(1),
+          base::Time::Now(), false, false,
+          net::PRIORITY_MEDIUM));
+
+  // Add a high-priority peristent cookie.
+  store_->AddCookie(
+      net::CanonicalCookie(
+          GURL(), kHighName, kCookieValue, kCookieDomain, kCookiePath,
+          base::Time::Now() - base::TimeDelta::FromMinutes(3),
+          base::Time::Now() + base::TimeDelta::FromDays(1),
+          base::Time::Now(), false, false,
+          net::PRIORITY_HIGH));
+
+  // Add a default-priority persistent cookie.

[erikwright (departed), 2013/04/18 19:34:05]

I would remove this one - it's not testing anything inside the SQLite store
because PRIORITY_MEDIUM is mapped to a real priority before it even gets to the
store.

[Roger McFarlane (Chromium), 2013/04/19 20:53:03]

Done.

+  store_->AddCookie(
+      net::CanonicalCookie(
+          GURL(), kDefaultName, kCookieValue, kCookieDomain, kCookiePath,
+          base::Time::Now() - base::TimeDelta::FromMinutes(4),
+          base::Time::Now() + base::TimeDelta::FromDays(1),
+          base::Time::Now(), false, false,
+          net::PRIORITY_DEFAULT));
+
+  // Force the store to write its data to the disk.
+  DestroyStore();
+
+  // Create a store that loads session cookie and test that the priority
+  // attribute values are restored.
+  CanonicalCookieVector cookies;
+  CreateAndLoad(true, &cookies);
+  ASSERT_EQ(4U, cookies.size());
+
+  // Put the cookies into a map, by name, so we can easily find them.
+  std::map<std::string, net::CanonicalCookie*> cookie_map;
+  for (CanonicalCookieVector::const_iterator it = cookies.begin();
+       it != cookies.end();
+       ++it) {
+    cookie_map[(*it)->Name()] = *it;
+  }
+
+  // Validate that each cookie has the correct priority.
+  std::map<std::string, net::CanonicalCookie*>::const_iterator it =
+      cookie_map.find(kLowName);
+  ASSERT_TRUE(it != cookie_map.end());
+  EXPECT_EQ(net::PRIORITY_LOW, cookie_map[kLowName]->Priority());
+
+  it = cookie_map.find(kMediumName);
+  ASSERT_TRUE(it != cookie_map.end());
+  EXPECT_EQ(net::PRIORITY_MEDIUM, cookie_map[kMediumName]->Priority());
+
+  it = cookie_map.find(kHighName);
+  ASSERT_TRUE(it != cookie_map.end());
+  EXPECT_EQ(net::PRIORITY_HIGH, cookie_map[kHighName]->Priority());
+
+  it = cookie_map.find(kDefaultName);
+  ASSERT_TRUE(it != cookie_map.end());
+  EXPECT_EQ(net::PRIORITY_DEFAULT, cookie_map[kDefaultName]->Priority());
+
+  STLDeleteElements(&cookies);
+}
+
 }  // namespace content