| Index: content/browser/frame_host/debug_urls.cc
|
| diff --git a/content/browser/frame_host/debug_urls.cc b/content/browser/frame_host/debug_urls.cc
|
| index 9aafa8aa39c6ac87412f46f8a8851e4449b29f07..dd86fca4c47aed6d5979ccc0f3625a8afeef5007 100644
|
| --- a/content/browser/frame_host/debug_urls.cc
|
| +++ b/content/browser/frame_host/debug_urls.cc
|
| @@ -22,7 +22,6 @@
|
| #include "content/public/common/content_constants.h"
|
| #include "content/public/common/url_constants.h"
|
| #include "ppapi/features/features.h"
|
| -#include "third_party/kasko/kasko_features.h"
|
| #include "url/gurl.h"
|
|
|
| #if BUILDFLAG(ENABLE_PLUGINS)
|
| @@ -49,12 +48,6 @@ const char kAsanCorruptHeapBlock[] = "/browser-corrupt-heap-block";
|
| const char kAsanCorruptHeap[] = "/browser-corrupt-heap";
|
| #endif
|
|
|
| -#if BUILDFLAG(ENABLE_KASKO)
|
| -// Define the Kasko debug URLs.
|
| -const char kKaskoCrashDomain[] = "kasko";
|
| -const char kKaskoSendReport[] = "/send-report";
|
| -#endif
|
| -
|
| void HandlePpapiFlashDebugURL(const GURL& url) {
|
| #if BUILDFLAG(ENABLE_PLUGINS)
|
| bool crash = url == kChromeUIPpapiFlashCrashURL;
|
| @@ -72,50 +65,6 @@ void HandlePpapiFlashDebugURL(const GURL& url) {
|
| #endif
|
| }
|
|
|
| -bool IsKaskoDebugURL(const GURL& url) {
|
| -#if BUILDFLAG(ENABLE_KASKO)
|
| - return (url.is_valid() && url.SchemeIs(kChromeUIScheme) &&
|
| - url.DomainIs(kKaskoCrashDomain) &&
|
| - url.path_piece() == kKaskoSendReport);
|
| -#else
|
| - return false;
|
| -#endif
|
| -}
|
| -
|
| -void HandleKaskoDebugURL() {
|
| -#if BUILDFLAG(ENABLE_KASKO)
|
| - // Signature of the exported crash key setting function.
|
| - using SetCrashKeyValueImplPtr = void(__cdecl *)(const wchar_t*,
|
| - const wchar_t*);
|
| - // Signature of an enhanced crash reporting function.
|
| - using ReportCrashWithProtobufPtr = void(__cdecl *)(EXCEPTION_POINTERS*,
|
| - const char*);
|
| -
|
| - HMODULE exe_hmodule = ::GetModuleHandle(NULL);
|
| -
|
| - // First, set a crash key using the exported function reserved for Kasko
|
| - // clients (SyzyASAN for now).
|
| - SetCrashKeyValueImplPtr set_crash_key_value_impl =
|
| - reinterpret_cast<SetCrashKeyValueImplPtr>(
|
| - ::GetProcAddress(exe_hmodule, "SetCrashKeyValueImpl"));
|
| - if (set_crash_key_value_impl)
|
| - set_crash_key_value_impl(L"kasko-set-crash-key-value-impl", L"true");
|
| - else
|
| - NOTREACHED();
|
| -
|
| - // Next, invoke a crash report via Kasko.
|
| - ReportCrashWithProtobufPtr report_crash_with_protobuf =
|
| - reinterpret_cast<ReportCrashWithProtobufPtr>(
|
| - ::GetProcAddress(exe_hmodule, "ReportCrashWithProtobuf"));
|
| - if (report_crash_with_protobuf)
|
| - report_crash_with_protobuf(NULL, "Invoked from debug url.");
|
| - else
|
| - NOTREACHED();
|
| -#else
|
| - NOTIMPLEMENTED();
|
| -#endif
|
| -}
|
| -
|
| bool IsAsanDebugURL(const GURL& url) {
|
| #if defined(SYZYASAN)
|
| if (!base::debug::IsBinaryInstrumented())
|
| @@ -197,11 +146,6 @@ bool HandleDebugURL(const GURL& url, ui::PageTransition transition) {
|
| if (IsAsanDebugURL(url))
|
| return HandleAsanDebugURL(url);
|
|
|
| - if (IsKaskoDebugURL(url)) {
|
| - HandleKaskoDebugURL();
|
| - return true;
|
| - }
|
| -
|
| if (url == kChromeUIBrowserCrashURL) {
|
| // Induce an intentional crash in the browser process.
|
| CHECK(false);
|
|
|