| Index: chrome/browser/extensions/api/cookies/cookies_unittest.cc
|
| diff --git a/chrome/browser/extensions/api/cookies/cookies_unittest.cc b/chrome/browser/extensions/api/cookies/cookies_unittest.cc
|
| index 0844b837e223e4fea0c3b60591c719387ed929e1..aa28f4dbdafbb7a8bc8206c74d387cc9fec48277 100644
|
| --- a/chrome/browser/extensions/api/cookies/cookies_unittest.cc
|
| +++ b/chrome/browser/extensions/api/cookies/cookies_unittest.cc
|
| @@ -14,6 +14,7 @@
|
| #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;
|
| @@ -114,7 +115,7 @@ 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"));
|
| @@ -128,10 +129,13 @@ TEST_F(ExtensionCookiesTest, ExtensionTypeCreation) {
|
| 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"));
|
| @@ -139,6 +143,7 @@ TEST_F(ExtensionCookiesTest, ExtensionTypeCreation) {
|
| 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();
|
| @@ -152,14 +157,14 @@ TEST_F(ExtensionCookiesTest, ExtensionTypeCreation) {
|
| 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());
|
| @@ -204,7 +209,8 @@ TEST_F(ExtensionCookiesTest, DomainMatching) {
|
| base::Time(),
|
| base::Time(),
|
| false,
|
| - false);
|
| + false,
|
| + net::PRIORITY_DEFAULT);
|
| EXPECT_EQ(tests[i].matches, filter.MatchesCookie(cookie));
|
| }
|
| }
|
| @@ -219,7 +225,8 @@ TEST_F(ExtensionCookiesTest, DecodeUTF8WithErrorHandling) {
|
| base::Time(),
|
| base::Time(),
|
| false,
|
| - false);
|
| + false,
|
| + net::PRIORITY_DEFAULT);
|
| scoped_ptr<Cookie> cookie(
|
| cookies_helpers::CreateCookie(
|
| canonical_cookie, "some cookie store"));
|
|
|