| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "build/build_config.h" | 5 #include "build/build_config.h" |
| 6 | 6 |
| 7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
| 8 #include <windows.h> | 8 #include <windows.h> |
| 9 #endif | 9 #endif |
| 10 | 10 |
| (...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 155 } | 155 } |
| 156 }; | 156 }; |
| 157 | 157 |
| 158 #if defined(OS_LINUX) && !defined(USE_LINUX_BREAKPAD) | 158 #if defined(OS_LINUX) && !defined(USE_LINUX_BREAKPAD) |
| 159 // On Linux, do not expect a crash dump if Breakpad is disabled. | 159 // On Linux, do not expect a crash dump if Breakpad is disabled. |
| 160 #define EXPECTED_CRASH_CRASHES 0 | 160 #define EXPECTED_CRASH_CRASHES 0 |
| 161 #else | 161 #else |
| 162 #define EXPECTED_CRASH_CRASHES 1 | 162 #define EXPECTED_CRASH_CRASHES 1 |
| 163 #endif | 163 #endif |
| 164 | 164 |
| 165 #if defined(OS_WIN) | 165 #if defined(OS_CHROMEOS) |
| 166 // http://crbug.com/32048 | |
| 167 #define Crash FLAKY_Crash | |
| 168 #elif defined(OS_CHROMEOS) | |
| 169 // http://crbug.com/43115 | 166 // http://crbug.com/43115 |
| 170 #define Crash DISABLED_Crash | 167 #define Crash DISABLED_Crash |
| 171 #elif defined(OS_MACOSX) | 168 #elif defined(OS_MACOSX) |
| 172 // Crash service doesn't exist for the Mac yet: http://crbug.com/45243 | 169 // Crash service doesn't exist for the Mac yet: http://crbug.com/45243 |
| 173 #define Crash DISABLED_Crash | 170 #define Crash DISABLED_Crash |
| 174 #endif | 171 #endif |
| 175 // Launch the app in renderer crash test mode, then close the app. | 172 // Launch the app in renderer crash test mode, then close the app. |
| 176 TEST_F(RendererCrashTest, Crash) { | 173 TEST_F(RendererCrashTest, Crash) { |
| 177 if (UITest::in_process_renderer()) { | 174 if (UITest::in_process_renderer()) { |
| 178 // in process mode doesn't do the crashing. | 175 // in process mode doesn't do the crashing. |
| 179 expected_crashes_ = 0; | 176 expected_crashes_ = 0; |
| 180 } else { | 177 } else { |
| 181 scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); | 178 scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); |
| 182 ASSERT_TRUE(browser.get()); | 179 ASSERT_TRUE(browser.get()); |
| 183 ASSERT_TRUE(browser->WaitForTabCountToBecome(1)); | 180 ASSERT_TRUE(browser->WaitForTabCountToBecome(1)); |
| 184 expected_crashes_ = EXPECTED_CRASH_CRASHES; | 181 expected_crashes_ = EXPECTED_CRASH_CRASHES; |
| 185 } | 182 } |
| 186 } | 183 } |
| OLD | NEW |