| Index: media/midi/midi_manager_mac_unittest.cc
|
| diff --git a/media/midi/midi_manager_mac_unittest.cc b/media/midi/midi_manager_mac_unittest.cc
|
| index 4ee525e93b6534561f32e07781866801b590c114..6adf5acf93addd28011a307b56261e602f062bcd 100644
|
| --- a/media/midi/midi_manager_mac_unittest.cc
|
| +++ b/media/midi/midi_manager_mac_unittest.cc
|
| @@ -26,7 +26,7 @@ void Noop(const MIDIPacketList*, void*, void*) {}
|
| class FakeMidiManagerClient : public MidiManagerClient {
|
| public:
|
| FakeMidiManagerClient()
|
| - : result_(Result::NOT_SUPPORTED),
|
| + : result_(mojom::Result::NOT_SUPPORTED),
|
| wait_for_result_(true),
|
| wait_for_port_(true),
|
| unexpected_callback_(false) {}
|
| @@ -52,7 +52,7 @@ class FakeMidiManagerClient : public MidiManagerClient {
|
| void SetInputPortState(uint32_t port_index, MidiPortState state) override {}
|
| void SetOutputPortState(uint32_t port_index, MidiPortState state) override {}
|
|
|
| - void CompleteStartSession(Result result) override {
|
| + void CompleteStartSession(mojom::Result result) override {
|
| base::AutoLock lock(lock_);
|
| if (!wait_for_result_)
|
| unexpected_callback_ = true;
|
| @@ -97,7 +97,7 @@ class FakeMidiManagerClient : public MidiManagerClient {
|
|
|
| private:
|
| base::Lock lock_;
|
| - Result result_;
|
| + mojom::Result result_;
|
| bool wait_for_result_;
|
| MidiPortInfo info_;
|
| bool wait_for_port_;
|
| @@ -137,8 +137,8 @@ TEST_F(MidiManagerMacTest, MidiNotification) {
|
| std::unique_ptr<FakeMidiManagerClient> client(new FakeMidiManagerClient);
|
| StartSession(client.get());
|
|
|
| - Result result = client->WaitForResult();
|
| - EXPECT_EQ(Result::OK, result);
|
| + mojom::Result result = client->WaitForResult();
|
| + EXPECT_EQ(mojom::Result::OK, result);
|
|
|
| // Create MIDIClient, and MIDIEndpoint as a MIDIDestination. This should
|
| // notify MIDIManagerMac as a MIDIObjectAddRemoveNotification.
|
|
|