CookieStore callback: Change signature to accommodate inclusion statuses
This changes the CookieStore's GetCookieListCallback from taking a
CookieList (for included cookies) and a CookieStatusList (for excluded
cookies), to taking a CookieStatusList for both. Previously, the
statuses of included cookies could be assumed to be INCLUDE, so they
did not need to be passed to the callback. The next change adds more
nuanced information to CookieInclusionStatus such that statuses must
be explicitly passed even for included cookies, hence a CookieStatusList
must be provided.
This also makes GetAllCookiesCallback take a CookieList only, since the
second CookieStatusList parameter (for excluded cookies, of which there
were none, since we are getting all cookies) was unused.
Bug: 993843
Change-Id: I4c6bedc0c161f863b9a1755bb93e615f2793202e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1758437
Commit-Queue: Lily Chen <[email protected]>
Reviewed-by: Achuith Bhandarkar <[email protected]>
Reviewed-by: Karan Bhatia <[email protected]>
Reviewed-by: Andrey Kosyakov <[email protected]>
Reviewed-by: John Abd-El-Malek <[email protected]>
Reviewed-by: Kyle Horimoto <[email protected]>
Reviewed-by: Martin Šrámek <[email protected]>
Reviewed-by: Tom Sepez <[email protected]>
Reviewed-by: Ryan Sturm <[email protected]>
Reviewed-by: Wez <[email protected]>
Reviewed-by: Eugene But <[email protected]>
Reviewed-by: Marc Treib <[email protected]>
Reviewed-by: Balazs Engedy <[email protected]>
Reviewed-by: Maks Orlovich <[email protected]>
Reviewed-by: Richard Coles <[email protected]>
Cr-Commit-Position: refs/heads/master@{#689162}
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index a560b617..f2e1b678 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -140,6 +140,7 @@
#include "net/cookies/canonical_cookie.h"
#include "net/cookies/cookie_options.h"
#include "net/cookies/cookie_store.h"
+#include "net/cookies/cookie_util.h"
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_context_getter.h"
#include "ppapi/buildflags/buildflags.h"
@@ -4863,9 +4864,9 @@
result_ = (result == net::CanonicalCookie::CookieInclusionStatus::INCLUDE);
}
- void GetAllCookiesCallback(const net::CookieList& list,
+ void GetAllCookiesCallback(const net::CookieStatusList& list,
const net::CookieStatusList& excluded_list) {
- list_ = list;
+ list_ = net::cookie_util::StripStatuses(list);
}
net::CookieList list_;
bool result_;
@@ -4999,9 +5000,9 @@
void GetCookiesSaveData(std::vector<net::CanonicalCookie>* result_out,
base::OnceClosure callback,
- const std::vector<net::CanonicalCookie>& result,
+ const net::CookieStatusList& result,
const net::CookieStatusList& excluded_cookies) {
- *result_out = result;
+ *result_out = net::cookie_util::StripStatuses(result);
std::move(callback).Run();
}
