Merge from Chromium at DEPS revision r213780

This commit was generated by merge_to_master.py.

Change-Id: I9cf93efc460166e8ae27c76302af9095b402a90e

2 files changed, 8 insertions, 18 deletions

diff --git a/media/midi/midi_manager.cc b/media/midi/midi_manager.cc
index f9918656b1..3f74477186 100644
--- a/media/midi/midi_manager.cc
+++ b/media/midi/midi_manager.cc
@@ -19,12 +19,7 @@ MIDIManager::MIDIManager()
 
 MIDIManager::~MIDIManager() {}
 
-bool MIDIManager::RequestAccess(MIDIManagerClient* client, int access) {
-  // TODO(crogers): determine if user prompt is necessary here.
-  // For now, simply don't allow sysex.
-  if (access != kNoSystemExclusive)
-    return false;
-
+bool MIDIManager::StartSession(MIDIManagerClient* client) {
   // Lazily initialize the MIDI back-end.
   if (!initialized_)
     initialized_ = Initialize();
@@ -37,7 +32,7 @@ bool MIDIManager::RequestAccess(MIDIManagerClient* client, int access) {
   return initialized_;
 }
 
-void MIDIManager::ReleaseAccess(MIDIManagerClient* client) {
+void MIDIManager::EndSession(MIDIManagerClient* client) {
   base::AutoLock auto_lock(clients_lock_);
   ClientList::iterator i = clients_.find(client);
   if (i != clients_.end())
diff --git a/media/midi/midi_manager.h b/media/midi/midi_manager.h
index 1df444f448..e13b2c3be0 100644
--- a/media/midi/midi_manager.h
+++ b/media/midi/midi_manager.h
@@ -36,24 +36,19 @@ class MEDIA_EXPORT MIDIManagerClient {
 // Manages access to all MIDI hardware.
 class MEDIA_EXPORT MIDIManager {
  public:
-  enum AccessType {
-    kNoSystemExclusive,
-    kSystemExclusive
-  };
-
   static MIDIManager* Create();
 
   MIDIManager();
   virtual ~MIDIManager();
 
-  // A client calls RequestAccess() to receive and send MIDI data.
-  // If access is approved, the MIDI system is lazily initialized
+  // A client calls StartSession() to receive and send MIDI data.
+  // If the session is ready to start, the MIDI system is lazily initialized
   // and the client is registered to receive MIDI data.
-  // Returns |true| if access is approved.
-  bool RequestAccess(MIDIManagerClient* client, int access);
+  // Returns |true| if the session succeeds to start.
+  bool StartSession(MIDIManagerClient* client);
 
-  // A client calls ReleaseAccess() to stop receiving MIDI data.
-  void ReleaseAccess(MIDIManagerClient* client);
+  // A client calls ReleaseSession() to stop receiving MIDI data.
+  void EndSession(MIDIManagerClient* client);
 
   // SendMIDIData() sends one or more messages at the given time.
   // |port_index| represents the specific output port from output_ports().