diff options
Diffstat (limited to 'chrome/browser/printing/print_job_unittest.cc')
| -rw-r--r-- | chrome/browser/printing/print_job_unittest.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/chrome/browser/printing/print_job_unittest.cc b/chrome/browser/printing/print_job_unittest.cc index 3fb56c9..8cda744 100644 --- a/chrome/browser/printing/print_job_unittest.cc +++ b/chrome/browser/printing/print_job_unittest.cc @@ -85,13 +85,8 @@ class TestPrintNotifObserv : public content::NotificationObserver { typedef testing::Test PrintJobTest; -// Crashes under Linux Aura, see http://crbug.com/100340 -#if defined(USE_AURA) && !defined(OS_WIN) -#define MAYBE_SimplePrint DISABLED_SimplePrint -#else -#define MAYBE_SimplePrint SimplePrint -#endif -TEST_F(PrintJobTest, MAYBE_SimplePrint) { +#if !defined(USE_AURA) +TEST_F(PrintJobTest, SimplePrint) { // Test the multi-threaded nature of PrintJob to make sure we can use it with // known lifetime. @@ -112,6 +107,7 @@ TEST_F(PrintJobTest, MAYBE_SimplePrint) { job = NULL; EXPECT_TRUE(check); } +#endif TEST_F(PrintJobTest, SimplePrintLateInit) { volatile bool check = false; |