diff options
| author | raymes@chromium.org <raymes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-13 22:50:52 +0000 |
|---|---|---|
| committer | raymes@chromium.org <raymes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-13 22:50:52 +0000 |
| commit | ae6ef14fe8d5c5df694efc7e09bcf86e4747d7ad (patch) | |
| tree | 86009a4aaab8a5df46c8e7652cf23fe9fdf16de2 /chrome/browser/policy | |
| parent | ea5ef4c89bd17065f32e1f294d8b922a0735fd25 (diff) | |
| download | chromium_src-ae6ef14fe8d5c5df694efc7e09bcf86e4747d7ad.zip chromium_src-ae6ef14fe8d5c5df694efc7e09bcf86e4747d7ad.tar.gz chromium_src-ae6ef14fe8d5c5df694efc7e09bcf86e4747d7ad.tar.bz2 | |
Make the infobar popup when Pepper Flash requests the camera/microphone
This makes opening the microphone/camera devices for pepper pop the same infobar as WebRTC with an allow/deny button.
BUG=249335
TBR=tsepez@chromium.org, xians@chromium.org, yzshen@chromium.org
Review URL: https://codereview.chromium.org/16920003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206188 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/policy')
| -rw-r--r-- | chrome/browser/policy/policy_browsertest.cc | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc index 2ea0c62..2c59387 100644 --- a/chrome/browser/policy/policy_browsertest.cc +++ b/chrome/browser/policy/policy_browsertest.cc @@ -2281,26 +2281,32 @@ class MediaStreamDevicesControllerBrowserTest void FinishAudioTest() { content::MediaStreamRequest request(0, 0, request_url_.GetOrigin(), - content::MEDIA_OPEN_DEVICE, "fake_dev", + content::MEDIA_DEVICE_ACCESS, + "fake_dev", content::MEDIA_DEVICE_AUDIO_CAPTURE, content::MEDIA_NO_SERVICE); + // TODO(raymes): Test MEDIA_DEVICE_OPEN (Pepper) which grants both webcam + // and microphone permissions at the same time. MediaStreamDevicesController controller( browser()->tab_strip_model()->GetActiveWebContents(), request, base::Bind(&MediaStreamDevicesControllerBrowserTest::Accept, this)); - controller.DismissInfoBarAndTakeActionOnSettings(); + controller.Accept(false); base::MessageLoop::current()->QuitWhenIdle(); } void FinishVideoTest() { + // TODO(raymes): Test MEDIA_DEVICE_OPEN (Pepper) which grants both webcam + // and microphone permissions at the same time. content::MediaStreamRequest request(0, 0, request_url_.GetOrigin(), - content::MEDIA_OPEN_DEVICE, "fake_dev", + content::MEDIA_DEVICE_ACCESS, + "fake_dev", content::MEDIA_NO_SERVICE, content::MEDIA_DEVICE_VIDEO_CAPTURE); MediaStreamDevicesController controller( browser()->tab_strip_model()->GetActiveWebContents(), request, base::Bind(&MediaStreamDevicesControllerBrowserTest::Accept, this)); - controller.DismissInfoBarAndTakeActionOnSettings(); + controller.Accept(false); base::MessageLoop::current()->QuitWhenIdle(); } |