Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 152 #if defined(OS_LINUX) && !defined(USE_LINUX_BREAKPAD) | 152 #if defined(OS_LINUX) && !defined(USE_LINUX_BREAKPAD) |
| 153 // On Linux, do not expect a crash dump if Breakpad is disabled. | 153 // On Linux, do not expect a crash dump if Breakpad is disabled. |
| 154 #define EXPECTED_CRASH_CRASHES 0 | 154 #define EXPECTED_CRASH_CRASHES 0 |
| 155 #else | 155 #else |
| 156 #define EXPECTED_CRASH_CRASHES 1 | 156 #define EXPECTED_CRASH_CRASHES 1 |
| 157 #endif | 157 #endif |
| 158 | 158 |
| 159 #if defined(OS_MACOSX) | 159 #if defined(OS_MACOSX) |
| 160 // Crash service doesn't exist for the Mac yet: http://crbug.com/45243 | 160 // Crash service doesn't exist for the Mac yet: http://crbug.com/45243 |
| 161 #define Crash DISABLED_Crash | 161 #define Crash DISABLED_Crash |
| 162 #elif defined(OS_CHROME) | |
| 163 #define Crash FLAKY_Crash | |
| 162 #endif | 164 #endif |
| 163 // Launch the app in renderer crash test mode, then close the app. | 165 // Launch the app in renderer crash test mode, then close the app. |
| 164 TEST_F(RendererCrashTest, Crash) { | 166 TEST_F(RendererCrashTest, Crash) { |
|
grt (UTC plus 2)
2011/12/12 18:33:27
would you change this and the #defines above to MA
willchan no longer on Chromium
2011/12/12 18:38:22
Done.
| |
| 165 scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); | 167 scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); |
| 166 ASSERT_TRUE(browser.get()); | 168 ASSERT_TRUE(browser.get()); |
| 167 ASSERT_TRUE(browser->WaitForTabCountToBecome(1)); | 169 ASSERT_TRUE(browser->WaitForTabCountToBecome(1)); |
| 168 expected_crashes_ = EXPECTED_CRASH_CRASHES; | 170 expected_crashes_ = EXPECTED_CRASH_CRASHES; |
| 169 } | 171 } |
| OLD | NEW |