Web MIDI: namespace change from media to media::midi

content/renderer/media/midi_message_filter.cc

Index: content/renderer/media/midi_message_filter.cc
diff --git a/content/renderer/media/midi_message_filter.cc b/content/renderer/media/midi_message_filter.cc
index b4eea4671e79823dcffd9ce027531e390766c5fc..07b85436e654388e82c9d8b57682801c17a2c471 100644
--- a/content/renderer/media/midi_message_filter.cc
+++ b/content/renderer/media/midi_message_filter.cc
@@ -14,7 +14,6 @@
 #include "content/renderer/render_thread_impl.h"
 #include "ipc/ipc_logging.h"
 
-using media::MidiPortInfoList;
 using base::AutoLock;
 
 // The maximum number of bytes which we're allowed to send to the browser
@@ -30,7 +29,7 @@ MidiMessageFilter::MidiMessageFilter(
     : sender_(nullptr),
       io_message_loop_(io_message_loop),
       main_message_loop_(base::MessageLoopProxy::current()),
-      session_result_(media::MIDI_NOT_INITIALIZED),
+      session_result_(media::midi::MIDI_NOT_INITIALIZED),
       unacknowledged_bytes_sent_(0u) {
 }
 
@@ -40,7 +39,7 @@ void MidiMessageFilter::AddClient(blink::WebMIDIAccessorClient* client) {
   DCHECK(main_message_loop_->BelongsToCurrentThread());
   TRACE_EVENT0("midi", "MidiMessageFilter::AddClient");
   clients_waiting_session_queue_.push_back(client);
-  if (session_result_ != media::MIDI_NOT_INITIALIZED) {
+  if (session_result_ != media::midi::MIDI_NOT_INITIALIZED) {
     HandleClientAdded(session_result_);
   } else if (clients_waiting_session_queue_.size() == 1u) {
     io_message_loop_->PostTask(FROM_HERE,
@@ -57,7 +56,7 @@ void MidiMessageFilter::RemoveClient(blink::WebMIDIAccessorClient* client) {
   if (it != clients_waiting_session_queue_.end())
     clients_waiting_session_queue_.erase(it);
   if (clients_.empty() && clients_waiting_session_queue_.empty()) {
-    session_result_ = media::MIDI_NOT_INITIALIZED;
+    session_result_ = media::midi::MIDI_NOT_INITIALIZED;
     inputs_.clear();
     outputs_.clear();
     io_message_loop_->PostTask(FROM_HERE,
@@ -142,7 +141,7 @@ void MidiMessageFilter::OnChannelClosing() {
   sender_ = nullptr;
 }
 
-void MidiMessageFilter::OnSessionStarted(media::MidiResult result) {
+void MidiMessageFilter::OnSessionStarted(media::midi::MidiResult result) {
   TRACE_EVENT0("midi", "MidiMessageFilter::OnSessionStarted");
   DCHECK(io_message_loop_->BelongsToCurrentThread());
   // Handle on the main JS thread.
@@ -151,14 +150,14 @@ void MidiMessageFilter::OnSessionStarted(media::MidiResult result) {
       base::Bind(&MidiMessageFilter::HandleClientAdded, this, result));
 }
 
-void MidiMessageFilter::OnAddInputPort(media::MidiPortInfo info) {
+void MidiMessageFilter::OnAddInputPort(media::midi::MidiPortInfo info) {
   DCHECK(io_message_loop_->BelongsToCurrentThread());
   main_message_loop_->PostTask(
       FROM_HERE,
       base::Bind(&MidiMessageFilter::HandleAddInputPort, this, info));
 }
 
-void MidiMessageFilter::OnAddOutputPort(media::MidiPortInfo info) {
+void MidiMessageFilter::OnAddOutputPort(media::midi::MidiPortInfo info) {
   DCHECK(io_message_loop_->BelongsToCurrentThread());
   main_message_loop_->PostTask(
       FROM_HERE,
@@ -166,7 +165,7 @@ void MidiMessageFilter::OnAddOutputPort(media::MidiPortInfo info) {
 }
 
 void MidiMessageFilter::OnSetInputPortState(uint32 port,
-                                            media::MidiPortState state) {
+                                            media::midi::MidiPortState state) {
   DCHECK(io_message_loop_->BelongsToCurrentThread());
   main_message_loop_->PostTask(
       FROM_HERE,
@@ -175,7 +174,7 @@ void MidiMessageFilter::OnSetInputPortState(uint32 port,
 }
 
 void MidiMessageFilter::OnSetOutputPortState(uint32 port,
-                                             media::MidiPortState state) {
+                                             media::midi::MidiPortState state) {
   DCHECK(io_message_loop_->BelongsToCurrentThread());
   main_message_loop_->PostTask(
       FROM_HERE,
@@ -203,19 +202,19 @@ void MidiMessageFilter::OnAcknowledgeSentData(size_t bytes_sent) {
                  bytes_sent));
 }
 
-void MidiMessageFilter::HandleClientAdded(media::MidiResult result) {
+void MidiMessageFilter::HandleClientAdded(media::midi::MidiResult result) {
   TRACE_EVENT0("midi", "MidiMessageFilter::HandleClientAdded");
   DCHECK(main_message_loop_->BelongsToCurrentThread());
   session_result_ = result;
   std::string error;
   std::string message;
   switch (result) {
-    case media::MIDI_OK:
+    case media::midi::MIDI_OK:
       break;
-    case media::MIDI_NOT_SUPPORTED:
+    case media::midi::MIDI_NOT_SUPPORTED:
       error = "NotSupportedError";
       break;
-    case media::MIDI_INITIALIZATION_ERROR:
+    case media::midi::MIDI_INITIALIZATION_ERROR:
       error = "InvalidStateError";
       message = "Platform dependent initialization failed.";
       break;
@@ -233,7 +232,7 @@ void MidiMessageFilter::HandleClientAdded(media::MidiResult result) {
   while (!clients_waiting_session_queue_.empty()) {
     auto client = clients_waiting_session_queue_.back();
     clients_waiting_session_queue_.pop_back();
-    if (result == media::MIDI_OK) {
+    if (result == media::midi::MIDI_OK) {
       // Add the client's input and output ports.
       for (const auto& info : inputs_) {
         client->didAddInputPort(
@@ -253,12 +252,12 @@ void MidiMessageFilter::HandleClientAdded(media::MidiResult result) {
             ToBlinkState(info.state));
       }
     }
-    client->didStartSession(result == media::MIDI_OK, error16, message16);
+    client->didStartSession(result == media::midi::MIDI_OK, error16, message16);
     clients_.insert(client);
   }
 }
 
-void MidiMessageFilter::HandleAddInputPort(media::MidiPortInfo info) {
+void MidiMessageFilter::HandleAddInputPort(media::midi::MidiPortInfo info) {
   DCHECK(main_message_loop_->BelongsToCurrentThread());
   inputs_.push_back(info);
   const base::string16 id = base::UTF8ToUTF16(info.id);
@@ -271,7 +270,7 @@ void MidiMessageFilter::HandleAddInputPort(media::MidiPortInfo info) {
     client->didAddInputPort(id, manufacturer, name, version, state);
 }
 
-void MidiMessageFilter::HandleAddOutputPort(media::MidiPortInfo info) {
+void MidiMessageFilter::HandleAddOutputPort(media::midi::MidiPortInfo info) {
   DCHECK(main_message_loop_->BelongsToCurrentThread());
   outputs_.push_back(info);
   const base::string16 id = base::UTF8ToUTF16(info.id);
@@ -302,16 +301,18 @@ void MidiMessageFilter::HandleAckknowledgeSentData(size_t bytes_sent) {
     unacknowledged_bytes_sent_ -= bytes_sent;
 }
 
-void MidiMessageFilter::HandleSetInputPortState(uint32 port,
-                                                media::MidiPortState state) {
+void MidiMessageFilter::HandleSetInputPortState(
+    uint32 port,
+    media::midi::MidiPortState state) {
   DCHECK(main_message_loop_->BelongsToCurrentThread());
   inputs_[port].state = state;
   for (auto client : clients_)
     client->didSetInputPortState(port, ToBlinkState(state));
 }
 
-void MidiMessageFilter::HandleSetOutputPortState(uint32 port,
-                                                 media::MidiPortState state) {
+void MidiMessageFilter::HandleSetOutputPortState(
+    uint32 port,
+    media::midi::MidiPortState state) {
   DCHECK(main_message_loop_->BelongsToCurrentThread());
   outputs_[port].state = state;
   for (auto client : clients_)