diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-09 20:10:17 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-09 20:10:17 +0000 |
| commit | 9cdd080dcaf1108e0d0f9dcac65adb836401d4e8 (patch) | |
| tree | 58d6d4493dea55beebf54dac366ee7f85cddb72a /chrome/common/logging_chrome_uitest.cc | |
| parent | 4eff7becd7a6be9621ae807c7aa3627d95c5913b (diff) | |
| download | chromium_src-9cdd080dcaf1108e0d0f9dcac65adb836401d4e8.zip chromium_src-9cdd080dcaf1108e0d0f9dcac65adb836401d4e8.tar.gz chromium_src-9cdd080dcaf1108e0d0f9dcac65adb836401d4e8.tar.bz2 | |
Revert 131404 - Upstream native crash handling changes for Android.
Android native crash handling is almost identical to linux handling with
some differences.
Note that even after this change Chrome on Android will not compile with
the USE_LINUX_BREAKPAD flag. Forthcomming changes in breakpad should
remedy this state of affairs.
BUG=
TEST=
Review URL: http://codereview.chromium.org/9838033
TBR=carlosvaldivia@google.com
Review URL: https://chromiumcodereview.appspot.com/9999004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131420 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/logging_chrome_uitest.cc')
| -rw-r--r-- | chrome/common/logging_chrome_uitest.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/common/logging_chrome_uitest.cc b/chrome/common/logging_chrome_uitest.cc index 551fbd9..8c87ff4 100644 --- a/chrome/common/logging_chrome_uitest.cc +++ b/chrome/common/logging_chrome_uitest.cc @@ -66,8 +66,7 @@ TEST_F(ChromeLoggingTest, EnvironmentLogFileName) { RestoreEnvironmentVariable(); } -#if (defined(OS_LINUX) || defined(OS_ANDROID)) \ - && (!defined(NDEBUG) || !defined(USE_LINUX_BREAKPAD)) +#if defined(OS_LINUX) && (!defined(NDEBUG) || !defined(USE_LINUX_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. @@ -150,7 +149,7 @@ class RendererCrashTest : public UITest { } }; -#if (defined(OS_LINUX) || defined(OS_ANDROID)) && !defined(USE_LINUX_BREAKPAD) +#if defined(OS_LINUX) && !defined(USE_LINUX_BREAKPAD) // On Linux, do not expect a crash dump if Breakpad is disabled. #define EXPECTED_CRASH_CRASHES 0 #else |