| Index: net/base/cookie_monster.cc
|
| diff --git a/net/base/cookie_monster.cc b/net/base/cookie_monster.cc
|
| index fdfd77924e5cb72477a3233059c64d5d0f0e4333..cccac5497627acf1b0031cfc73c2adb4fe63f975 100644
|
| --- a/net/base/cookie_monster.cc
|
| +++ b/net/base/cookie_monster.cc
|
| @@ -1351,13 +1351,12 @@ CookieList CookieMonster::GetAllCookies() {
|
| return cookie_list;
|
| }
|
|
|
| -CookieList CookieMonster::GetAllCookiesForURL(const GURL& url) {
|
| +CookieList CookieMonster::GetAllCookiesForURLWithOptions(
|
| + const GURL& url,
|
| + const CookieOptions& options) {
|
| AutoLock autolock(lock_);
|
| InitIfNecessary();
|
|
|
| - CookieOptions options;
|
| - options.set_include_httponly();
|
| -
|
| std::vector<CanonicalCookie*> cookie_ptrs;
|
| FindCookiesForHostAndDomain(url, options, false, &cookie_ptrs);
|
| std::sort(cookie_ptrs.begin(), cookie_ptrs.end(), CookieSorter);
|
| @@ -1370,6 +1369,13 @@ CookieList CookieMonster::GetAllCookiesForURL(const GURL& url) {
|
| return cookies;
|
| }
|
|
|
| +CookieList CookieMonster::GetAllCookiesForURL(const GURL& url) {
|
| + CookieOptions options;
|
| + options.set_include_httponly();
|
| +
|
| + return GetAllCookiesForURLWithOptions(url, options);
|
| +}
|
| +
|
| void CookieMonster::FindCookiesForHostAndDomain(
|
| const GURL& url,
|
| const CookieOptions& options,
|
|
|