diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 20:30:47 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 20:30:47 +0000 |
| commit | e8c7581be58121cea28a4df050811da7a03e3c8f (patch) | |
| tree | 4ce277b2183db8f14a2f6428a011d0589300a2b0 /chrome/browser/ui/select_file_dialog_unittest.cc | |
| parent | cb114f14b97f51eb35991e98f4483a944ef1c323 (diff) | |
| download | chromium_src-e8c7581be58121cea28a4df050811da7a03e3c8f.zip chromium_src-e8c7581be58121cea28a4df050811da7a03e3c8f.tar.gz chromium_src-e8c7581be58121cea28a4df050811da7a03e3c8f.tar.bz2 | |
Build & run unit tests on Aura (Rebase)
Applied patch from http://codereview.chromium.org/8665006/
BUG=none
TEST=duh
TBR=ben@chromium.org
Review URL: http://codereview.chromium.org/8677014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111403 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/select_file_dialog_unittest.cc')
| -rw-r--r-- | chrome/browser/ui/select_file_dialog_unittest.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/ui/select_file_dialog_unittest.cc b/chrome/browser/ui/select_file_dialog_unittest.cc index fff0893..e714f12 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); |