| Index: chrome/browser/media/webrtc/media_stream_devices_controller.cc
|
| diff --git a/chrome/browser/media/webrtc/media_stream_devices_controller.cc b/chrome/browser/media/webrtc/media_stream_devices_controller.cc
|
| index 31119bf51972bb1ea041bc369056549fbc56bf6a..b24b64a0ac41dc742313a8889e717ac3891e3a02 100644
|
| --- a/chrome/browser/media/webrtc/media_stream_devices_controller.cc
|
| +++ b/chrome/browser/media/webrtc/media_stream_devices_controller.cc
|
| @@ -746,14 +746,8 @@ ContentSetting MediaStreamDevicesController::GetNewSetting(
|
| DCHECK(user_decision == CONTENT_SETTING_ALLOW ||
|
| user_decision == CONTENT_SETTING_BLOCK);
|
| ContentSetting result = old_setting;
|
| - if (old_setting == CONTENT_SETTING_ASK) {
|
| - if (user_decision == CONTENT_SETTING_ALLOW &&
|
| - IsUserAcceptAllowed(content_type)) {
|
| - result = CONTENT_SETTING_ALLOW;
|
| - } else if (user_decision == CONTENT_SETTING_BLOCK) {
|
| - result = CONTENT_SETTING_BLOCK;
|
| - }
|
| - }
|
| + if (old_setting == CONTENT_SETTING_ASK)
|
| + result = user_decision;
|
| return result;
|
| }
|
|
|
|
|