| Index: content/renderer/pepper/pepper_media_device_manager.cc
|
| diff --git a/content/renderer/pepper/pepper_media_device_manager.cc b/content/renderer/pepper/pepper_media_device_manager.cc
|
| index aaf437f0f0228b8ee7646db604ad3e353109b135..0d54964ebc43be717448af96ad6ff693228c3522 100644
|
| --- a/content/renderer/pepper/pepper_media_device_manager.cc
|
| +++ b/content/renderer/pepper/pepper_media_device_manager.cc
|
| @@ -16,7 +16,9 @@ namespace {
|
| ppapi::DeviceRefData FromStreamDeviceInfo(const StreamDeviceInfo& info) {
|
| ppapi::DeviceRefData data;
|
| data.id = info.device.id;
|
| - data.name = info.device.name;
|
| + // Some Flash content can't handle an empty string, so stick a space in to
|
| + // make them happy. See crbug.com/408404.
|
| + data.name = info.device.name.empty() ? std::string(" ") : info.device.name;
|
| data.type = PepperMediaDeviceManager::FromMediaStreamType(info.device.type);
|
| return data;
|
| }
|
|
|