Commit e9152484 authored by Maks Orlovich's avatar Maks Orlovich Committed by Commit Bot

Fix site_for_cookies check of browser vs. render computation.

Sadly wanting a DCHECK for asan_canary coverage gets in the way of
testability here.

(This is done for metrics only, as a prep step before switching over).

Change-Id: Ia8c272a90459c885ec3fdae7d9879a1b5413c36b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1913063Reviewed-by: default avatarLily Chen <chlily@chromium.org>
Commit-Queue: Maksim Orlovich <morlovich@chromium.org>
Cr-Commit-Position: refs/heads/master@{#714890}
parent a42550a7
...@@ -488,16 +488,17 @@ bool RestrictedCookieManager::ValidateAccessToCookiesAt( ...@@ -488,16 +488,17 @@ bool RestrictedCookieManager::ValidateAccessToCookiesAt(
const GURL& url, const GURL& url,
const GURL& site_for_cookies, const GURL& site_for_cookies,
const url::Origin& top_frame_origin) { const url::Origin& top_frame_origin) {
bool site_for_cookies_ok = true; bool site_for_cookies_ok =
(site_for_cookies.is_empty() == site_for_cookies_.is_empty());
if (!site_for_cookies.is_empty() && !site_for_cookies_.is_empty()) { if (!site_for_cookies.is_empty() && !site_for_cookies_.is_empty()) {
site_for_cookies_ok = net::registry_controlled_domains::SameDomainOrHost( site_for_cookies_ok = net::registry_controlled_domains::SameDomainOrHost(
site_for_cookies, site_for_cookies_, site_for_cookies, site_for_cookies_,
net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES); net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES);
}
DCHECK(site_for_cookies_ok) DCHECK(site_for_cookies_ok)
<< "site_for_cookies from renderer='" << site_for_cookies << "site_for_cookies from renderer='" << site_for_cookies
<< "' from browser='" << site_for_cookies_ << "';"; << "' from browser='" << site_for_cookies_ << "';";
}
bool top_frame_origin_ok = (top_frame_origin == top_frame_origin_); bool top_frame_origin_ok = (top_frame_origin == top_frame_origin_);
DCHECK(top_frame_origin_ok) DCHECK(top_frame_origin_ok)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment