Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3479)

Unified Diff: chrome/browser/ui/select_file_dialog_unittest.cc

Issue 8677014: Build & run unit tests on Aura (Rebase) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/select_file_dialog_unittest.cc
diff --git a/chrome/browser/ui/select_file_dialog_unittest.cc b/chrome/browser/ui/select_file_dialog_unittest.cc
index fff0893cd84b2f3de173981eb52140f3b91357da..e714f127b0a4c60aa8cc9da313c8814005a21d0c 100644
--- a/chrome/browser/ui/select_file_dialog_unittest.cc
+++ b/chrome/browser/ui/select_file_dialog_unittest.cc
@@ -17,6 +17,13 @@
#include "content/test/test_browser_thread.h"
#include "testing/gtest/include/gtest/gtest.h"
+#if defined(USE_AURA) && defined(OS_WIN)
+// http://crbug.com/105200
+#define MAYBE_ExpectAsynchronousListenerCall DISABLED_ExpectAsynchronousListenerCall
+#else
+#define MAYBE_ExpectAsynchronousListenerCall ExpectAsynchronousListenerCall
+#endif
+
using content::BrowserThread;
class FileSelectionUser : public SelectFileDialog::Listener {
@@ -74,7 +81,7 @@ typedef testing::Test FileSelectionDialogTest;
// Tests if SelectFileDialog::SelectFile returns asynchronously with
// file-selection dialogs disabled by policy.
-TEST_F(FileSelectionDialogTest, ExpectAsynchronousListenerCall) {
+TEST_F(FileSelectionDialogTest, MAYBE_ExpectAsynchronousListenerCall) {
MessageLoopForUI message_loop;
content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop);

Powered by Google App Engine
This is Rietveld 408576698