summaryrefslogtreecommitdiffstats
path: root/chrome/browser/printing/print_job_unittest.cc
diff options
context:
space:
mode:
authorjennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-25 19:17:48 +0000
committerjennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-25 19:17:48 +0000
commit567376ddf1bd9b95f5eeb1ee7156de35c1d8a016 (patch)
treec5017c4768e15fada8838fd17d4180811f85d563 /chrome/browser/printing/print_job_unittest.cc
parenteacd87c04cb1f5b8b4aa8db649e4cef0bfa15583 (diff)
downloadchromium_src-567376ddf1bd9b95f5eeb1ee7156de35c1d8a016.zip
chromium_src-567376ddf1bd9b95f5eeb1ee7156de35c1d8a016.tar.gz
chromium_src-567376ddf1bd9b95f5eeb1ee7156de35c1d8a016.tar.bz2
Remove SimplePrint unit test issue from aura build.
BUG=100340 TEST=NONE Review URL: http://codereview.chromium.org/8395009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107176 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/printing/print_job_unittest.cc')
-rw-r--r--chrome/browser/printing/print_job_unittest.cc10
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;