Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1810)

Unified Diff: android_webview/native/aw_debug.cc

Issue 2717223003: Add WebView-specific whitelist for crash keys. (Closed)
Patch Set: Remove unnecessary imports/includes. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: android_webview/native/aw_debug.cc
diff --git a/android_webview/native/aw_debug.cc b/android_webview/native/aw_debug.cc
index b7d83b6fb28aa218eebe252ccf74965fb6d20725..6914f06cd447f9a2bc873bf612c83ab42a09f1a3 100644
--- a/android_webview/native/aw_debug.cc
+++ b/android_webview/native/aw_debug.cc
@@ -7,10 +7,12 @@
#include "android_webview/common/crash_reporter/aw_microdump_crash_reporter.h"
#include "base/android/jni_android.h"
#include "base/android/jni_string.h"
+#include "base/debug/crash_logging.h"
#include "base/debug/dump_without_crashing.h"
#include "base/files/file.h"
#include "base/files/file_path.h"
#include "base/threading/thread_restrictions.h"
+#include "components/crash/content/app/breakpad_linux.h"
#include "jni/AwDebug_jni.h"
using base::android::ConvertJavaStringToUTF16;
@@ -36,6 +38,19 @@ static jboolean DumpWithoutCrashing(JNIEnv* env,
return crash_reporter::DumpWithoutCrashingToFd(target.TakePlatformFile());
}
+static void InitCrashKeysForWebViewTesting(JNIEnv* env,
+ const JavaParamRef<jclass>& clazz) {
+ breakpad::InitCrashKeysForTesting();
Tobias Sargeant 2017/03/02 16:36:48 Could you move this to aw/common/crash_reporter/cr
gsennton 2017/03/02 17:35:37 Done.
+}
+
+static void SetCrashKeyValue(JNIEnv* env,
+ const JavaParamRef<jclass>& clazz,
+ const JavaParamRef<jstring>& key,
+ const JavaParamRef<jstring>& value) {
+ base::debug::SetCrashKeyValue(ConvertJavaStringToUTF8(env, key),
+ ConvertJavaStringToUTF8(env, value));
+}
+
bool RegisterAwDebug(JNIEnv* env) {
return RegisterNativesImpl(env);
}

Powered by Google App Engine
This is Rietveld 408576698