Web MIDI: make naming convention be consistent

content/browser/renderer_host/media/midi_host.cc

Index: content/browser/renderer_host/media/midi_host.cc
diff --git a/content/browser/renderer_host/media/midi_host.cc b/content/browser/renderer_host/media/midi_host.cc
index 765ebc1b00a5e528743bc0723989f94e1b38c4bf..1d50a46899b8f0a21ebb74c2cb9169d79ffc22f6 100644
--- a/content/browser/renderer_host/media/midi_host.cc
+++ b/content/browser/renderer_host/media/midi_host.cc
@@ -19,8 +19,8 @@
 #include "media/midi/midi_message_queue.h"
 #include "media/midi/midi_message_util.h"
 
-using media::MIDIManager;
-using media::MIDIPortInfoList;
+using media::MidiManager;
+using media::MidiPortInfoList;
 
 namespace content {
 namespace {
@@ -48,7 +48,7 @@ bool IsSystemRealTimeMessage(uint8 data) {
 using media::kSysExByte;
 using media::kEndOfSysExByte;
 
-MIDIHost::MIDIHost(int renderer_process_id, media::MIDIManager* midi_manager)
+MidiHost::MidiHost(int renderer_process_id, media::MidiManager* midi_manager)
     : renderer_process_id_(renderer_process_id),
       has_sys_ex_permission_(false),
       midi_manager_(midi_manager),
@@ -56,32 +56,31 @@ MIDIHost::MIDIHost(int renderer_process_id, media::MIDIManager* midi_manager)
       bytes_sent_since_last_acknowledgement_(0) {
 }
 
-MIDIHost::~MIDIHost() {
+MidiHost::~MidiHost() {
   if (midi_manager_)
     midi_manager_->EndSession(this);
 }
 
-void MIDIHost::OnDestruct() const {
+void MidiHost::OnDestruct() const {
   BrowserThread::DeleteOnIOThread::Destruct(this);
 }
 
-///////////////////////////////////////////////////////////////////////////////
 // IPC Messages handler
-bool MIDIHost::OnMessageReceived(const IPC::Message& message,
+bool MidiHost::OnMessageReceived(const IPC::Message& message,
                                  bool* message_was_ok) {
   bool handled = true;
-  IPC_BEGIN_MESSAGE_MAP_EX(MIDIHost, message, *message_was_ok)
-    IPC_MESSAGE_HANDLER(MIDIHostMsg_StartSession, OnStartSession)
-    IPC_MESSAGE_HANDLER(MIDIHostMsg_SendData, OnSendData)
+  IPC_BEGIN_MESSAGE_MAP_EX(MidiHost, message, *message_was_ok)
+    IPC_MESSAGE_HANDLER(MidiHostMsg_StartSession, OnStartSession)
+    IPC_MESSAGE_HANDLER(MidiHostMsg_SendData, OnSendData)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP_EX()
 
   return handled;
 }
 
-void MIDIHost::OnStartSession(int client_id) {
-  MIDIPortInfoList input_ports;
-  MIDIPortInfoList output_ports;
+void MidiHost::OnStartSession(int client_id) {
+  MidiPortInfoList input_ports;
+  MidiPortInfoList output_ports;
 
   // Initialize devices and register to receive MIDI data.
   bool success = false;
@@ -93,20 +92,20 @@ void MIDIHost::OnStartSession(int client_id) {
       received_messages_queues_.clear();
       received_messages_queues_.resize(input_ports.size());
       // ChildSecurityPolicy is set just before OnStartSession by
-      // MIDIDispatcherHost. So we can safely cache the policy.
+      // MidiDispatcherHost. So we can safely cache the policy.
       has_sys_ex_permission_ = ChildProcessSecurityPolicyImpl::GetInstance()->
-          CanSendMIDISysExMessage(renderer_process_id_);
+          CanSendMidiSysExMessage(renderer_process_id_);
     }
   }
 
-  Send(new MIDIMsg_SessionStarted(
+  Send(new MidiMsg_SessionStarted(
        client_id,
        success,
        input_ports,
        output_ports));
 }
 
-void MIDIHost::OnSendData(uint32 port,
+void MidiHost::OnSendData(uint32 port,
                           const std::vector<uint8>& data,
                           double timestamp) {
   if (!midi_manager_)
@@ -134,23 +133,23 @@ void MIDIHost::OnSendData(uint32 port,
   // after some future discussion in W3C.
   if (data.size() + sent_bytes_in_flight_ > kMaxInFlightBytes)
     return;
-  midi_manager_->DispatchSendMIDIData(this, port, data, timestamp);
+  midi_manager_->DispatchSendMidiData(this, port, data, timestamp);
   sent_bytes_in_flight_ += data.size();
 }
 
-void MIDIHost::ReceiveMIDIData(
+void MidiHost::ReceiveMidiData(
     uint32 port,
     const uint8* data,
     size_t length,
     double timestamp) {
-  TRACE_EVENT0("midi", "MIDIHost::ReceiveMIDIData");
+  TRACE_EVENT0("midi", "MidiHost::ReceiveMidiData");
 
   if (received_messages_queues_.size() <= port)
     return;
 
   // Lazy initialization
   if (received_messages_queues_[port] == NULL)
-    received_messages_queues_[port] = new media::MIDIMessageQueue(true);
+    received_messages_queues_[port] = new media::MidiMessageQueue(true);
 
   received_messages_queues_[port]->Add(data, length);
   std::vector<uint8> message;
@@ -166,11 +165,11 @@ void MIDIHost::ReceiveMIDIData(
       continue;
 
     // Send to the renderer.
-    Send(new MIDIMsg_DataReceived(port, message, timestamp));
+    Send(new MidiMsg_DataReceived(port, message, timestamp));
   }
 }
 
-void MIDIHost::AccumulateMIDIBytesSent(size_t n) {
+void MidiHost::AccumulateMidiBytesSent(size_t n) {
   {
     base::AutoLock auto_lock(in_flight_lock_);
     if (n <= sent_bytes_in_flight_)
@@ -183,14 +182,14 @@ void MIDIHost::AccumulateMIDIBytesSent(size_t n) {
 
   if (bytes_sent_since_last_acknowledgement_ >=
       kAcknowledgementThresholdBytes) {
-    Send(new MIDIMsg_AcknowledgeSentData(
+    Send(new MidiMsg_AcknowledgeSentData(
         bytes_sent_since_last_acknowledgement_));
     bytes_sent_since_last_acknowledgement_ = 0;
   }
 }
 
 // static
-bool MIDIHost::IsValidWebMIDIData(const std::vector<uint8>& data) {
+bool MidiHost::IsValidWebMIDIData(const std::vector<uint8>& data) {
   bool in_sysex = false;
   size_t waiting_data_length = 0;
   for (size_t i = 0; i < data.size(); ++i) {
@@ -214,7 +213,7 @@ bool MIDIHost::IsValidWebMIDIData(const std::vector<uint8>& data) {
       in_sysex = true;
       continue;  // Found SysEX
     }
-    waiting_data_length = media::GetMIDIMessageLength(current);
+    waiting_data_length = media::GetMidiMessageLength(current);
     if (waiting_data_length == 0)
       return false;  // Error: |current| should have been a valid status byte.
     --waiting_data_length;  // Found status byte