Revert 150491 - refactor EnumerateDevices to make it a persistent request.

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 109 matching lines @@
       return PP_DEVICETYPE_DEV_INVALID;
   }
 }
 
 void PepperDeviceEnumerationEventHandler::NotifyDevicesEnumerated(
     int request_id,
     bool succeeded,
     const media_stream::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.
+    NOTREACHED();
     return;
   }
 
   webkit::ppapi::PluginDelegate::EnumerateDevicesCallback callback =
       iter->second;
   enumerate_callbacks_.erase(iter);
 
   std::vector<ppapi::DeviceRefData> devices;
   if (succeeded) {
     devices.reserve(device_array.size());
@@ skipping 15 matching lines @@
     return;
   }
 
   PepperPluginDelegateImpl::OpenDeviceCallback callback = iter->second;
   open_callbacks_.erase(iter);
 
   callback.Run(request_id, succeeded, label);
 }
 
 }  // namespace content