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

Unified Diff: chrome/common/logging_chrome_uitest.cc

Issue 9838033: Upstream native crash handling changes for Android. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: In response to comments. Lots of linux to posix Created 8 years, 9 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: chrome/common/logging_chrome_uitest.cc
diff --git a/chrome/common/logging_chrome_uitest.cc b/chrome/common/logging_chrome_uitest.cc
index 8c87ff49a0e711d5e59bfe8274e3277c8fd71e1f..e69466e81c886617d8cb23c6bd4ff36f8573df2c 100644
--- a/chrome/common/logging_chrome_uitest.cc
+++ b/chrome/common/logging_chrome_uitest.cc
@@ -66,7 +66,7 @@ TEST_F(ChromeLoggingTest, EnvironmentLogFileName) {
RestoreEnvironmentVariable();
}
-#if defined(OS_LINUX) && (!defined(NDEBUG) || !defined(USE_LINUX_BREAKPAD))
+#if defined(OS_LINUX) && (!defined(NDEBUG) || !defined(USE_POSIX_BREAKPAD))
// On Linux in Debug mode, Chrome generates a SIGTRAP.
// we do not catch SIGTRAPs, thus no crash dump.
// This also does not work if Breakpad is disabled.
@@ -149,7 +149,7 @@ class RendererCrashTest : public UITest {
}
};
-#if defined(OS_LINUX) && !defined(USE_LINUX_BREAKPAD)
+#if defined(OS_LINUX) && !defined(USE_POSIX_BREAKPAD)
Yaron 2012/04/03 23:54:20 Should this be || OS_ANDROID?
carlosvaldivia 2012/04/04 20:52:34 Done. Similar case elsewhere as well.
// On Linux, do not expect a crash dump if Breakpad is disabled.
#define EXPECTED_CRASH_CRASHES 0
#else

Powered by Google App Engine
This is Rietveld 408576698