summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_cookies_helpers.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/extensions/extension_cookies_helpers.cc')
-rw-r--r--chrome/browser/extensions/extension_cookies_helpers.cc21
1 files changed, 9 insertions, 12 deletions
diff --git a/chrome/browser/extensions/extension_cookies_helpers.cc b/chrome/browser/extensions/extension_cookies_helpers.cc
index 903e89e..2322c1d 100644
--- a/chrome/browser/extensions/extension_cookies_helpers.cc
+++ b/chrome/browser/extensions/extension_cookies_helpers.cc
@@ -40,16 +40,15 @@ const char* GetStoreIdFromProfile(Profile* profile) {
}
DictionaryValue* CreateCookieValue(
- const net::CookieMonster::CookieListPair& cookie_pair,
+ const net::CookieMonster::CanonicalCookie& cookie,
const std::string& store_id) {
DictionaryValue* result = new DictionaryValue();
- const net::CookieMonster::CanonicalCookie& cookie = cookie_pair.second;
result->SetString(keys::kNameKey, cookie.Name());
result->SetString(keys::kValueKey, cookie.Value());
- result->SetString(keys::kDomainKey, cookie_pair.first);
+ result->SetString(keys::kDomainKey, cookie.Domain());
result->SetBoolean(keys::kHostOnlyKey,
- net::CookieMonster::DomainIsHostOnly(cookie_pair.first));
+ net::CookieMonster::DomainIsHostOnly(cookie.Domain()));
result->SetString(keys::kPathKey, cookie.Path());
result->SetBoolean(keys::kSecureKey, cookie.IsSecure());
result->SetBoolean(keys::kHttpOnlyKey, cookie.IsHttpOnly());
@@ -82,10 +81,9 @@ net::CookieMonster::CookieList GetCookieListFromStore(
return monster->GetAllCookies();
}
-GURL GetURLFromCookiePair(
- const net::CookieMonster::CookieListPair& cookie_pair) {
- const std::string& domain_key = cookie_pair.first;
- const net::CookieMonster::CanonicalCookie& cookie = cookie_pair.second;
+GURL GetURLFromCanonicalCookie(
+ const net::CookieMonster::CanonicalCookie& cookie) {
+ const std::string& domain_key = cookie.Domain();
const std::string scheme =
cookie.IsSecure() ? chrome::kHttpsScheme : chrome::kHttpScheme;
const std::string host =
@@ -103,7 +101,7 @@ void AppendMatchingCookiesToList(
for (it = all_cookies.begin(); it != all_cookies.end(); ++it) {
// Ignore any cookie whose domain doesn't match the extension's
// host permissions.
- GURL cookie_domain_url = GetURLFromCookiePair(*it);
+ GURL cookie_domain_url = GetURLFromCanonicalCookie(*it);
if (!extension->HasHostPermission(cookie_domain_url))
continue;
// Filter the cookie using the match filter.
@@ -129,11 +127,10 @@ MatchFilter::MatchFilter(const DictionaryValue* details)
}
bool MatchFilter::MatchesCookie(
- const net::CookieMonster::CookieListPair& cookie_pair) {
- const net::CookieMonster::CanonicalCookie& cookie = cookie_pair.second;
+ const net::CookieMonster::CanonicalCookie& cookie) {
return
MatchesString(keys::kNameKey, cookie.Name()) &&
- MatchesDomain(cookie_pair.first) &&
+ MatchesDomain(cookie.Domain()) &&
MatchesString(keys::kPathKey, cookie.Path()) &&
MatchesBoolean(keys::kSecureKey, cookie.IsSecure()) &&
MatchesBoolean(keys::kSessionKey, !cookie.DoesExpire());