Introduce PPB_AudioInput_Dev v0.3 and refactor the device enumeration code:

content/renderer/pepper/pepper_device_enumeration_event_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/pepper/pepper_device_enumeration_event_handler.h"
 
 #include "base/logging.h"
 #include "ppapi/shared_impl/ppb_device_ref_shared.h"
 
 namespace content {
@@ skipping 19 matching lines @@
   DCHECK(enumerate_callbacks_.empty());
   DCHECK(open_callbacks_.empty());
 }
 
 int PepperDeviceEnumerationEventHandler::RegisterEnumerateDevicesCallback(
     const webkit::ppapi::PluginDelegate::EnumerateDevicesCallback& callback) {
   enumerate_callbacks_[next_id_] = callback;
   return next_id_++;
 }
 
+void PepperDeviceEnumerationEventHandler::UnregisterEnumerateDevicesCallback(
+    int request_id) {
+  enumerate_callbacks_.erase(request_id);
+}
+
 int PepperDeviceEnumerationEventHandler::RegisterOpenDeviceCallback(
     const PepperPluginDelegateImpl::OpenDeviceCallback& callback) {
   open_callbacks_[next_id_] = callback;
   return next_id_++;
 }
 
 void PepperDeviceEnumerationEventHandler::OnStreamGenerated(
     int request_id,
     const std::string& label,
     const StreamDeviceInfoArray& audio_device_array,
@@ skipping 64 matching lines @@
     const StreamDeviceInfoArray& device_array) {
   EnumerateCallbackMap::iterator iter = enumerate_callbacks_.find(request_id);
   if (iter == enumerate_callbacks_.end()) {
     // This might be enumerated result sent before StopEnumerateDevices is
     // called since EnumerateDevices is persistent request.
     return;
   }
 
   webkit::ppapi::PluginDelegate::EnumerateDevicesCallback callback =
       iter->second;
-  enumerate_callbacks_.erase(iter);
 
   std::vector<ppapi::DeviceRefData> devices;
   if (succeeded) {
     devices.reserve(device_array.size());
     for (StreamDeviceInfoArray::const_iterator info =
              device_array.begin(); info != device_array.end(); ++info) {
       devices.push_back(FromStreamDeviceInfo(*info));
     }
   }
   callback.Run(request_id, succeeded, devices);
 }
 
 void PepperDeviceEnumerationEventHandler::NotifyDeviceOpened(
     int request_id,
     bool succeeded,
     const std::string& label) {
   OpenCallbackMap::iterator iter = open_callbacks_.find(request_id);
   if (iter == open_callbacks_.end()) {
     NOTREACHED();
     return;
   }
 
   PepperPluginDelegateImpl::OpenDeviceCallback callback = iter->second;
   open_callbacks_.erase(iter);
 
   callback.Run(request_id, succeeded, label);
 }
 
 }  // namespace content