diff options
| author | dnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-06 22:56:00 +0000 |
|---|---|---|
| committer | dnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-06 22:56:00 +0000 |
| commit | ac85c7a7796ea7d622826fe92023cb23e3f08d69 (patch) | |
| tree | f6e07e68d79d82f26f0bc3bcf9e4a01359cca1f6 /media | |
| parent | 4efb5a05aa3a583e84f808e65befeff4a9141d34 (diff) | |
| download | chromium_src-ac85c7a7796ea7d622826fe92023cb23e3f08d69.zip chromium_src-ac85c7a7796ea7d622826fe92023cb23e3f08d69.tar.gz chromium_src-ac85c7a7796ea7d622826fe92023cb23e3f08d69.tar.bz2 | |
Fix build without any specific MidiManager provided
The fallback is the default MidiManager in media/midi/midi_manager.cc which
returns MIDI_NOT_SUPPORTED when initializing. In this case the unittest should
check that the status is MIDI_NOT_SUPPORTED.
NOTRY=true
Review URL: https://codereview.chromium.org/263393006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@268632 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/midi/midi_manager_unittest.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/media/midi/midi_manager_unittest.cc b/media/midi/midi_manager_unittest.cc index 456c2b0..bc8169e 100644 --- a/media/midi/midi_manager_unittest.cc +++ b/media/midi/midi_manager_unittest.cc @@ -175,7 +175,13 @@ TEST_F(MidiManagerTest, CreateMidiManager) { scoped_ptr<MidiManager> manager(MidiManager::Create()); manager->StartSession(client.get(), client->get_client_id()); + // This #ifdef needs to be identical to the one in media/midi/midi_manager.cc +#if !defined(OS_MACOSX) && !defined(OS_WIN) && !defined(USE_ALSA) && \ + !defined(OS_ANDROID) && !defined(OS_CHROMEOS) + EXPECT_EQ(MIDI_NOT_SUPPORTED, client->WaitForResult()); +#else EXPECT_EQ(MIDI_OK, client->WaitForResult()); +#endif } } // namespace |