| Index: content/renderer/media/audio_device_factory.cc
|
| diff --git a/content/renderer/media/audio_device_factory.cc b/content/renderer/media/audio_device_factory.cc
|
| index 52ed68e0211b8ba2b46b13cf7d98801a4f5be160..e83ca0fab5458495eb578981cdeb9739149d8682 100644
|
| --- a/content/renderer/media/audio_device_factory.cc
|
| +++ b/content/renderer/media/audio_device_factory.cc
|
| @@ -26,12 +26,13 @@ namespace content {
|
| AudioDeviceFactory* AudioDeviceFactory::factory_ = NULL;
|
|
|
| namespace {
|
| -#if defined(OS_WIN) || defined(OS_MACOSX)
|
| +#if defined(OS_WIN) || defined(OS_MACOSX) || \
|
| + (defined(OS_LINUX) && !defined(OS_CHROMEOS))
|
| // Due to driver deadlock issues on Windows (http://crbug/422522) there is a
|
| // chance device authorization response is never received from the browser side.
|
| // In this case we will time out, to avoid renderer hang forever waiting for
|
| // device authorization (http://crbug/615589). This will result in "no audio".
|
| -// There are also cases when authorization takes too long on Mac.
|
| +// There are also cases when authorization takes too long on Mac and Linux.
|
| const int64_t kMaxAuthorizationTimeoutMs = 10000;
|
| #else
|
| const int64_t kMaxAuthorizationTimeoutMs = 0; // No timeout.
|
|
|