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

Unified Diff: media/midi/midi_manager_unittest.cc

Issue 264973012: Use seq instead of rawmidi for MidiManagerAlsa (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Constify a few last things Created 6 years, 6 months 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
« no previous file with comments | « media/midi/midi_manager_alsa.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/midi/midi_manager_unittest.cc
diff --git a/media/midi/midi_manager_unittest.cc b/media/midi/midi_manager_unittest.cc
index c5c4138b6e0934c693f5bbe385160be0bb4ebacf..c129ca1779d6f9e0c2bebef928947bd23bf5e02f 100644
--- a/media/midi/midi_manager_unittest.cc
+++ b/media/midi/midi_manager_unittest.cc
@@ -224,13 +224,17 @@ TEST_F(MidiManagerTest, CreateMidiManager) {
scoped_ptr<MidiManager> manager(MidiManager::Create());
manager->StartSession(client.get(), client->client_id());
+ MidiResult result = client->WaitForResult();
// This #ifdef needs to be identical to the one in media/midi/midi_manager.cc.
// Do not change the condition for disabling this test.
#if !defined(OS_MACOSX) && !defined(OS_WIN) && !defined(USE_ALSA) && \
!defined(OS_ANDROID) && !defined(OS_CHROMEOS)
- EXPECT_EQ(MIDI_NOT_SUPPORTED, client->WaitForResult());
+ EXPECT_EQ(MIDI_NOT_SUPPORTED, result);
+#elif defined(USE_ALSA)
+ // Temporary until http://crbug.com/371230 is resolved.
+ EXPECT_TRUE((result == MIDI_OK) || (result == MIDI_INITIALIZATION_ERROR));
#else
- EXPECT_EQ(MIDI_OK, client->WaitForResult());
+ EXPECT_EQ(MIDI_OK, result);
#endif
}
« no previous file with comments | « media/midi/midi_manager_alsa.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698