Commit 2ade52bc authored by Julie Jeongeun Kim's avatar Julie Jeongeun Kim Committed by Commit Bot

Add WebRequestResourceType::OBJECT to DCHECK in HideRequest()

This CL adds WebRequestResourceType::OBJECT to DCHECK() in
WebRequestPermissions::HideRequest() since OBJECT type could
take this path.

Bug: 1145496
Change-Id: I77f620acbd18147de7faf90940523235feec62cf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2537509
Commit-Queue: Julie Kim <jkim@igalia.com>
Reviewed-by: default avatarKaran Bhatia <karandeepb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#827568}
parent 155debdc
...@@ -270,7 +270,9 @@ bool WebRequestPermissions::HideRequest( ...@@ -270,7 +270,9 @@ bool WebRequestPermissions::HideRequest(
if (request.web_request_type != if (request.web_request_type !=
extensions::WebRequestResourceType::MAIN_FRAME && extensions::WebRequestResourceType::MAIN_FRAME &&
request.web_request_type != request.web_request_type !=
extensions::WebRequestResourceType::SUB_FRAME) { extensions::WebRequestResourceType::SUB_FRAME &&
request.web_request_type !=
extensions::WebRequestResourceType::OBJECT) {
// TODO(crbug.com/1145496): Remove crash key logging once the DCHECK // TODO(crbug.com/1145496): Remove crash key logging once the DCHECK
// failure below is fixed. // failure below is fixed.
static auto* web_request_type_key = base::debug::AllocateCrashKeyString( static auto* web_request_type_key = base::debug::AllocateCrashKeyString(
...@@ -284,10 +286,7 @@ bool WebRequestPermissions::HideRequest( ...@@ -284,10 +286,7 @@ bool WebRequestPermissions::HideRequest(
base::debug::ScopedCrashKeyString scoped_url( base::debug::ScopedCrashKeyString scoped_url(
url_key, request.url.possibly_invalid_spec()); url_key, request.url.possibly_invalid_spec());
DCHECK(request.web_request_type == DCHECK(false);
extensions::WebRequestResourceType::MAIN_FRAME ||
request.web_request_type ==
extensions::WebRequestResourceType::SUB_FRAME);
} }
// Hide sub-frame requests to clientsX.google.com. // Hide sub-frame requests to clientsX.google.com.
......
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