| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/message_loop.h" | 5 #include "base/message_loop.h" |
| 6 #include "base/string16.h" | 6 #include "base/string16.h" |
| 7 #include "chrome/browser/printing/print_job.h" | 7 #include "chrome/browser/printing/print_job.h" |
| 8 #include "chrome/browser/printing/print_job_worker.h" | 8 #include "chrome/browser/printing/print_job_worker.h" |
| 9 #include "chrome/common/chrome_notification_types.h" | 9 #include "chrome/common/chrome_notification_types.h" |
| 10 #include "content/common/notification_registrar.h" | 10 #include "content/common/notification_registrar.h" |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 const NotificationSource& source, | 78 const NotificationSource& source, |
| 79 const NotificationDetails& details) { | 79 const NotificationDetails& details) { |
| 80 ADD_FAILURE(); | 80 ADD_FAILURE(); |
| 81 } | 81 } |
| 82 }; | 82 }; |
| 83 | 83 |
| 84 } // namespace | 84 } // namespace |
| 85 | 85 |
| 86 typedef testing::Test PrintJobTest; | 86 typedef testing::Test PrintJobTest; |
| 87 | 87 |
| 88 TEST_F(PrintJobTest, SimplePrint) { | 88 // Crashes under Linux Aura, see http://crbug.com/100340 |
| 89 #if defined(USE_AURA) && !defined(OS_WIN) |
| 90 #define MAYBE_SimplePrint DISABLED_SimplePrint |
| 91 #else |
| 92 #define MAYBE_SimplePrint SimplePrint |
| 93 #endif |
| 94 TEST_F(PrintJobTest, MAYBE_SimplePrint) { |
| 89 // Test the multi-threaded nature of PrintJob to make sure we can use it with | 95 // Test the multi-threaded nature of PrintJob to make sure we can use it with |
| 90 // known lifetime. | 96 // known lifetime. |
| 91 | 97 |
| 92 // This message loop is actually never run. | 98 // This message loop is actually never run. |
| 93 MessageLoop current; | 99 MessageLoop current; |
| 94 | 100 |
| 95 NotificationRegistrar registrar_; | 101 NotificationRegistrar registrar_; |
| 96 TestPrintNotifObserv observ; | 102 TestPrintNotifObserv observ; |
| 97 registrar_.Add(&observ, content::NOTIFICATION_ALL, | 103 registrar_.Add(&observ, content::NOTIFICATION_ALL, |
| 98 NotificationService::AllSources()); | 104 NotificationService::AllSources()); |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 131 job->is_job_pending(); | 137 job->is_job_pending(); |
| 132 job->document(); | 138 job->document(); |
| 133 // Private | 139 // Private |
| 134 job->UpdatePrintedDocument(NULL); | 140 job->UpdatePrintedDocument(NULL); |
| 135 scoped_refptr<printing::JobEventDetails> event_details; | 141 scoped_refptr<printing::JobEventDetails> event_details; |
| 136 job->OnNotifyPrintJobEvent(event_details); | 142 job->OnNotifyPrintJobEvent(event_details); |
| 137 job->OnDocumentDone(); | 143 job->OnDocumentDone(); |
| 138 job->ControlledWorkerShutdown(); | 144 job->ControlledWorkerShutdown(); |
| 139 */ | 145 */ |
| 140 } | 146 } |
| OLD | NEW |