Web MIDI: use midi_service.mojom for media::midi::Result

media/midi/midi_manager_usb_unittest.cc

Index: media/midi/midi_manager_usb_unittest.cc
diff --git a/media/midi/midi_manager_usb_unittest.cc b/media/midi/midi_manager_usb_unittest.cc
index db49b3b202f56d20fae53bdfe6e92e7120b3eb49..2969cbc900bff586ba882ca0a57cc2f34fcdc8fa 100644
--- a/media/midi/midi_manager_usb_unittest.cc
+++ b/media/midi/midi_manager_usb_unittest.cc
@@ -95,7 +95,7 @@ class FakeMidiManagerClient : public MidiManagerClient {
  public:
   explicit FakeMidiManagerClient(Logger* logger)
       : complete_start_session_(false),
-        result_(Result::NOT_SUPPORTED),
+        result_(mojom::Result::NOT_SUPPORTED),
         logger_(logger) {}
   ~FakeMidiManagerClient() override {}
 
@@ -111,7 +111,7 @@ class FakeMidiManagerClient : public MidiManagerClient {
 
   void SetOutputPortState(uint32_t port_index, MidiPortState state) override {}
 
-  void CompleteStartSession(Result result) override {
+  void CompleteStartSession(mojom::Result result) override {
     complete_start_session_ = true;
     result_ = result;
   }
@@ -138,7 +138,7 @@ class FakeMidiManagerClient : public MidiManagerClient {
   void Detach() override {}
 
   bool complete_start_session_;
-  Result result_;
+  mojom::Result result_;
   MidiPortInfoList input_ports_;
   MidiPortInfoList output_ports_;
 
@@ -170,7 +170,7 @@ class MidiManagerUsbForTesting : public MidiManagerUsb {
       : MidiManagerUsb(std::move(device_factory)) {}
   ~MidiManagerUsbForTesting() override {}
 
-  void CallCompleteInitialization(Result result) {
+  void CallCompleteInitialization(mojom::Result result) {
     CompleteInitialization(result);
     base::RunLoop run_loop;
     run_loop.RunUntilIdle();
@@ -213,7 +213,7 @@ class MidiManagerUsbTest : public ::testing::Test {
     return client_->complete_start_session_;
   }
 
-  Result GetInitializationResult() { return client_->result_; }
+  mojom::Result GetInitializationResult() { return client_->result_; }
 
   void RunCallbackUntilCallbackInvoked(
       bool result, UsbMidiDevice::Devices* devices) {
@@ -266,7 +266,7 @@ TEST_F(MidiManagerUsbTest, Initialize) {
   devices.push_back(std::move(device));
   EXPECT_FALSE(IsInitializationCallbackInvoked());
   RunCallbackUntilCallbackInvoked(true, &devices);
-  EXPECT_EQ(Result::OK, GetInitializationResult());
+  EXPECT_EQ(mojom::Result::OK, GetInitializationResult());
 
   ASSERT_EQ(1u, input_ports().size());
   EXPECT_EQ("usb:port-0-2", input_ports()[0].id);
@@ -327,7 +327,7 @@ TEST_F(MidiManagerUsbTest, InitializeMultipleDevices) {
   devices.push_back(std::move(device2));
   EXPECT_FALSE(IsInitializationCallbackInvoked());
   RunCallbackUntilCallbackInvoked(true, &devices);
-  EXPECT_EQ(Result::OK, GetInitializationResult());
+  EXPECT_EQ(mojom::Result::OK, GetInitializationResult());
 
   ASSERT_EQ(2u, input_ports().size());
   EXPECT_EQ("usb:port-0-2", input_ports()[0].id);
@@ -376,7 +376,7 @@ TEST_F(MidiManagerUsbTest, InitializeFail) {
 
   EXPECT_FALSE(IsInitializationCallbackInvoked());
   RunCallbackUntilCallbackInvoked(false, NULL);
-  EXPECT_EQ(Result::INITIALIZATION_ERROR, GetInitializationResult());
+  EXPECT_EQ(mojom::Result::INITIALIZATION_ERROR, GetInitializationResult());
 }
 
 TEST_F(MidiManagerUsbTest, InitializeFailBecauseOfInvalidDescriptors) {
@@ -389,7 +389,7 @@ TEST_F(MidiManagerUsbTest, InitializeFailBecauseOfInvalidDescriptors) {
   devices.push_back(std::move(device));
   EXPECT_FALSE(IsInitializationCallbackInvoked());
   RunCallbackUntilCallbackInvoked(true, &devices);
-  EXPECT_EQ(Result::INITIALIZATION_ERROR, GetInitializationResult());
+  EXPECT_EQ(mojom::Result::INITIALIZATION_ERROR, GetInitializationResult());
   EXPECT_EQ("UsbMidiDevice::GetDescriptors\n", logger_.TakeLog());
 }
 
@@ -420,7 +420,7 @@ TEST_F(MidiManagerUsbTest, Send) {
   devices.push_back(std::move(device));
   EXPECT_FALSE(IsInitializationCallbackInvoked());
   RunCallbackUntilCallbackInvoked(true, &devices);
-  EXPECT_EQ(Result::OK, GetInitializationResult());
+  EXPECT_EQ(mojom::Result::OK, GetInitializationResult());
   ASSERT_EQ(2u, manager_->output_streams().size());
 
   manager_->DispatchSendMidiData(client_.get(), 1, ToVector(data), 0);
@@ -464,7 +464,7 @@ TEST_F(MidiManagerUsbTest, SendFromCompromizedRenderer) {
   devices.push_back(std::move(device));
   EXPECT_FALSE(IsInitializationCallbackInvoked());
   RunCallbackUntilCallbackInvoked(true, &devices);
-  EXPECT_EQ(Result::OK, GetInitializationResult());
+  EXPECT_EQ(mojom::Result::OK, GetInitializationResult());
   ASSERT_EQ(2u, manager_->output_streams().size());
   EXPECT_EQ("UsbMidiDevice::GetDescriptors\n", logger_.TakeLog());
 
@@ -507,7 +507,7 @@ TEST_F(MidiManagerUsbTest, Receive) {
   devices.push_back(std::move(device));
   EXPECT_FALSE(IsInitializationCallbackInvoked());
   RunCallbackUntilCallbackInvoked(true, &devices);
-  EXPECT_EQ(Result::OK, GetInitializationResult());
+  EXPECT_EQ(mojom::Result::OK, GetInitializationResult());
 
   manager_->ReceiveUsbMidiData(device_raw, 2, data, arraysize(data),
                                base::TimeTicks());
@@ -543,7 +543,7 @@ TEST_F(MidiManagerUsbTest, AttachDevice) {
   ScopedVector<UsbMidiDevice> devices;
   EXPECT_FALSE(IsInitializationCallbackInvoked());
   RunCallbackUntilCallbackInvoked(true, &devices);
-  EXPECT_EQ(Result::OK, GetInitializationResult());
+  EXPECT_EQ(mojom::Result::OK, GetInitializationResult());
 
   ASSERT_EQ(0u, input_ports().size());
   ASSERT_EQ(0u, output_ports().size());