Commit 1cdcdc7e authored by Julie Jeongeun Kim's avatar Julie Jeongeun Kim Committed by Commit Bot

Add crash key logging to debug WebRequestType

This CL adds crash key logging to track WebRequestType and URL
on WebRequestPermissions::HideRequest().

Bug: 1145496
Change-Id: Ib4658ef497c922b181e84d530bf05ab4e532dc5a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2521885
Commit-Queue: Julie Kim <jkim@igalia.com>
Reviewed-by: default avatarKaran Bhatia <karandeepb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#824852}
parent 63a68852
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include "extensions/browser/api/web_request/web_request_permissions.h" #include "extensions/browser/api/web_request/web_request_permissions.h"
#include "base/debug/crash_logging.h"
#include "base/metrics/histogram_macros.h" #include "base/metrics/histogram_macros.h"
#include "base/stl_util.h" #include "base/stl_util.h"
#include "base/strings/string_piece.h" #include "base/strings/string_piece.h"
...@@ -265,10 +266,28 @@ bool WebRequestPermissions::HideRequest( ...@@ -265,10 +266,28 @@ bool WebRequestPermissions::HideRequest(
if (!request.is_navigation_request) if (!request.is_navigation_request)
return true; return true;
DCHECK(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) {
// TODO(crbug.com/1145496): Remove crash key logging once the DCHECK
// failure below is fixed.
static auto* web_request_type_key = base::debug::AllocateCrashKeyString(
"web_request_type", base::debug::CrashKeySize::Size32);
static auto* url_key = base::debug::AllocateCrashKeyString(
"web_request_url", base::debug::CrashKeySize::Size256);
base::debug::ScopedCrashKeyString scoped_web_request_type(
web_request_type_key,
WebRequestResourceTypeToString(request.web_request_type));
base::debug::ScopedCrashKeyString scoped_url(
url_key, request.url.possibly_invalid_spec());
DCHECK(request.web_request_type ==
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.
// TODO(crbug.com/890006): Determine if the code here can be cleaned up // TODO(crbug.com/890006): Determine if the code here can be cleaned up
......
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