Adding Priority field to cookies.

chrome/browser/extensions/api/cookies/cookies_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.
 
 // Tests common functionality used by the Chrome Extensions Cookies API
 // implementation.
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include "base/values.h"
 #include "chrome/browser/extensions/api/cookies/cookies_api_constants.h"
 #include "chrome/browser/extensions/api/cookies/cookies_helpers.h"
 #include "chrome/common/extensions/api/cookies.h"
 #include "chrome/test/base/testing_profile.h"
 #include "googleurl/src/gurl.h"
 #include "net/cookies/canonical_cookie.h"
+#include "net/cookies/cookie_constants.h"
 
 using extensions::api::cookies::Cookie;
 using extensions::api::cookies::CookieStore;
 
 namespace GetAll = extensions::api::cookies::GetAll;
 
 namespace extensions {
 
 namespace keys = cookies_api_constants;
 
@@ skipping 80 matching lines @@
                 "1", &otrProfile, true));
   EXPECT_EQ(&otrProfile,
             cookies_helpers::ChooseProfileFromStoreId(
                 "1", &otrProfile, false));
 }
 
 TEST_F(ExtensionCookiesTest, ExtensionTypeCreation) {
   net::CanonicalCookie canonical_cookie1(
       GURL(), "ABC", "DEF", "www.foobar.com", "/",
       base::Time(), base::Time(), base::Time(),
-      false, false);
+      false, false, net::PRIORITY_DEFAULT);
   scoped_ptr<Cookie> cookie1(
       cookies_helpers::CreateCookie(
           canonical_cookie1, "some cookie store"));
   EXPECT_EQ("ABC", cookie1->name);
   EXPECT_EQ("DEF", cookie1->value);
   EXPECT_EQ("www.foobar.com", cookie1->domain);
   EXPECT_TRUE(cookie1->host_only);
   EXPECT_EQ("/", cookie1->path);
   EXPECT_FALSE(cookie1->secure);
   EXPECT_FALSE(cookie1->http_only);
   EXPECT_TRUE(cookie1->session);
   EXPECT_FALSE(cookie1->expiration_date.get());
   EXPECT_EQ("some cookie store", cookie1->store_id);
+  EXPECT_EQ(net::CookiePriorityToString(net::PRIORITY_DEFAULT),
+            cookie1->priority);
 
   net::CanonicalCookie canonical_cookie2(
-      GURL(), "ABC", "DEF", ".foobar.com", "/", base::Time(),
-      base::Time::FromDoubleT(10000), base::Time(), false, false);
+      GURL(), "ABC", "DEF", ".foobar.com", "/",
+      base::Time(), base::Time::FromDoubleT(10000), base::Time(),
+      false, false, net::PRIORITY_HIGH);
   scoped_ptr<Cookie> cookie2(
       cookies_helpers::CreateCookie(
           canonical_cookie2, "some cookie store"));
   EXPECT_FALSE(cookie2->host_only);
   EXPECT_FALSE(cookie2->session);
   ASSERT_TRUE(cookie2->expiration_date.get());
   EXPECT_EQ(10000, *cookie2->expiration_date);
+  EXPECT_EQ("high", cookie2->priority);
 
   TestingProfile profile;
   ListValue* tab_ids_list = new ListValue();
   std::vector<int> tab_ids;
   scoped_ptr<CookieStore> cookie_store(
       cookies_helpers::CreateCookieStore(&profile, tab_ids_list));
   EXPECT_EQ("0", cookie_store->id);
   EXPECT_EQ(tab_ids, cookie_store->tab_ids);
 }
 
 TEST_F(ExtensionCookiesTest, GetURLFromCanonicalCookie) {
   net::CanonicalCookie cookie1(
       GURL(), "ABC", "DEF", "www.foobar.com", "/", base::Time(), base::Time(),
-      base::Time(), false, false);
+      base::Time(), false, false, net::PRIORITY_HIGH);
   EXPECT_EQ("http://www.foobar.com/",
             cookies_helpers::GetURLFromCanonicalCookie(
                 cookie1).spec());
 
   net::CanonicalCookie cookie2(
       GURL(), "ABC", "DEF", ".helloworld.com", "/", base::Time(), base::Time(),
-      base::Time(), true, false);
+      base::Time(), true, false, net::PRIORITY_LOW);
   EXPECT_EQ("https://helloworld.com/",
             cookies_helpers::GetURLFromCanonicalCookie(
                 cookie2).spec());
 }
 
 TEST_F(ExtensionCookiesTest, EmptyDictionary) {
   DictionaryValue dict;
   GetAll::Params::Details details;
   bool rv = GetAll::Params::Details::Populate(dict, &details);
   ASSERT_TRUE(rv);
@@ skipping 24 matching lines @@
     cookies_helpers::MatchFilter filter(&params->details);
     net::CanonicalCookie cookie(GURL(),
                                 std::string(),
                                 std::string(),
                                 tests[i].domain,
                                 std::string(),
                                 base::Time(),
                                 base::Time(),
                                 base::Time(),
                                 false,
-                                false);
+                                false,
+                                net::PRIORITY_DEFAULT);
     EXPECT_EQ(tests[i].matches, filter.MatchesCookie(cookie));
   }
 }
 
 TEST_F(ExtensionCookiesTest, DecodeUTF8WithErrorHandling) {
   net::CanonicalCookie canonical_cookie(GURL(),
                                         std::string(),
                                         "011Q255bNX_1!yd\203e+",
                                         "test.com",
                                         "/path\203",
                                         base::Time(),
                                         base::Time(),
                                         base::Time(),
                                         false,
-                                        false);
+                                        false,
+                                        net::PRIORITY_DEFAULT);
   scoped_ptr<Cookie> cookie(
       cookies_helpers::CreateCookie(
           canonical_cookie, "some cookie store"));
   EXPECT_EQ(std::string("011Q255bNX_1!yd\xEF\xBF\xBD" "e+"), cookie->value);
   EXPECT_EQ(std::string(), cookie->path);
 }
 
 }  // namespace extensions