diff options
| author | jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-31 23:40:24 +0000 |
|---|---|---|
| committer | jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-31 23:40:24 +0000 |
| commit | 807cad6de14afec7e8ccf7ddcb63ebf81794df8d (patch) | |
| tree | 143908c7e7088fd5024610465963da524c6648f5 /chrome/browser/printing/print_job_unittest.cc | |
| parent | 141a38a4d36a27f3ec9d3d349c1f31ebe073a0cd (diff) | |
| download | chromium_src-807cad6de14afec7e8ccf7ddcb63ebf81794df8d.zip chromium_src-807cad6de14afec7e8ccf7ddcb63ebf81794df8d.tar.gz chromium_src-807cad6de14afec7e8ccf7ddcb63ebf81794df8d.tar.bz2 | |
Revert "Remove SimplePrint unit test issue from aura build."
This reverts commit 567376ddf1bd9b95f5eeb1ee7156de35c1d8a016.
Revert "Revert "Remove SimplePrint unit test issue from aura build.""
This reverts commit 06e40718bc6dbca1dba8d3ee24f78c95f57e3d2a.
Revert "Remove SimplePrint unit test issue from aura build."
This reverts commit 567376ddf1bd9b95f5eeb1ee7156de35c1d8a016.
BUG=100340
TEST=NONE
Review URL: http://codereview.chromium.org/8430010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108036 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/printing/print_job_unittest.cc')
| -rw-r--r-- | chrome/browser/printing/print_job_unittest.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/chrome/browser/printing/print_job_unittest.cc b/chrome/browser/printing/print_job_unittest.cc index 8cda744..3fb56c9 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; |