| Index: chrome/browser/printing/print_job_unittest.cc
|
| diff --git a/chrome/browser/printing/print_job_unittest.cc b/chrome/browser/printing/print_job_unittest.cc
|
| index 8cda7441f500827bace9c9f185b93e97b079c76a..3fb56c91ba4bf2178e7610cbbc78241a02626c32 100644
|
| --- a/chrome/browser/printing/print_job_unittest.cc
|
| +++ b/chrome/browser/printing/print_job_unittest.cc
|
| @@ -85,8 +85,13 @@ class TestPrintNotifObserv : public content::NotificationObserver {
|
|
|
| typedef testing::Test PrintJobTest;
|
|
|
| -#if !defined(USE_AURA)
|
| -TEST_F(PrintJobTest, SimplePrint) {
|
| +// 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) {
|
| // Test the multi-threaded nature of PrintJob to make sure we can use it with
|
| // known lifetime.
|
|
|
| @@ -107,7 +112,6 @@ TEST_F(PrintJobTest, SimplePrint) {
|
| job = NULL;
|
| EXPECT_TRUE(check);
|
| }
|
| -#endif
|
|
|
| TEST_F(PrintJobTest, SimplePrintLateInit) {
|
| volatile bool check = false;
|
|
|