Revert "Remove SimplePrint unit test issue from aura build."

This reverts commit 567376dd.

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 567376dd.

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

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;