1 files changed, 12 insertions, 12 deletions
diff --git a/chromium/media/midi/midi_manager_mac.h b/chromium/media/midi/midi_manager_mac.h
index cc8bf74a3c5..5c514ffdd02 100644
--- a/chromium/media/midi/midi_manager_mac.h
+++ b/chromium/media/midi/midi_manager_mac.h
@@ -18,14 +18,14 @@
 
 namespace media {
 
-class MEDIA_EXPORT MIDIManagerMac : public MIDIManager {
+class MEDIA_EXPORT MidiManagerMac : public MidiManager {
  public:
-  MIDIManagerMac();
-  virtual ~MIDIManagerMac();
+  MidiManagerMac();
+  virtual ~MidiManagerMac();
 
-  // MIDIManager implementation.
-  virtual bool Initialize() OVERRIDE;
-  virtual void DispatchSendMIDIData(MIDIManagerClient* client,
+  // MidiManager implementation.
+  virtual void StartInitialization() OVERRIDE;
+  virtual void DispatchSendMidiData(MidiManagerClient* client,
                                     uint32 port_index,
                                     const std::vector<uint8>& data,
                                     double timestamp) OVERRIDE;
@@ -34,20 +34,20 @@ class MEDIA_EXPORT MIDIManagerMac : public MIDIManager {
   // CoreMIDI callback for MIDI data.
   // Each callback can contain multiple packets, each of which can contain
   // multiple MIDI messages.
-  static void ReadMIDIDispatch(
+  static void ReadMidiDispatch(
       const MIDIPacketList *pktlist,
       void *read_proc_refcon,
       void *src_conn_refcon);
-  virtual void ReadMIDI(MIDIEndpointRef source, const MIDIPacketList *pktlist);
+  virtual void ReadMidi(MIDIEndpointRef source, const MIDIPacketList *pktlist);
 
-  // An internal callback that runs on MIDISendThread.
-  void SendMIDIData(MIDIManagerClient* client,
+  // An internal callback that runs on MidiSendThread.
+  void SendMidiData(MidiManagerClient* client,
                     uint32 port_index,
                     const std::vector<uint8>& data,
                     double timestamp);
 
   // Helper
-  static media::MIDIPortInfo GetPortInfoFromEndpoint(MIDIEndpointRef endpoint);
+  static media::MidiPortInfo GetPortInfoFromEndpoint(MIDIEndpointRef endpoint);
   static double MIDITimeStampToSeconds(MIDITimeStamp timestamp);
   static MIDITimeStamp SecondsToMIDITimeStamp(double seconds);
 
@@ -72,7 +72,7 @@ class MEDIA_EXPORT MIDIManagerMac : public MIDIManager {
   // |send_thread_| is used to send MIDI data.
   base::Thread send_thread_;
 
-  DISALLOW_COPY_AND_ASSIGN(MIDIManagerMac);
+  DISALLOW_COPY_AND_ASSIGN(MidiManagerMac);
 };
 
 }  // namespace media