Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(167)

Issue 1132203002: Switch media stream permissions to use IsOriginSecure() instead of SchemeIsSecure(). (Closed)

Created:
5 years, 7 months ago by lgarron
Modified:
5 years, 4 months ago
CC:
chromium-reviews, feature-media-reviews_chromium.org, felt, mcasas+watch_chromium.org, palmer, posciak+watch_chromium.org, raymes, wjia+watch_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Switch media stream permissions to use IsOriginSecure() instead of SchemeIsSecure(). In particular, note that this means that media permissions are persisted on http://localhost. The change also updates the old media stream permission tests (which were no longer testing anything meaningful). BUG=295723, 362214, 509844 Committed: https://crrev.com/2249c80e8c4b50793a8261c4f9eb3f879ddf4aff Cr-Commit-Position: refs/heads/master@{#342458}

Patch Set 1 #

Patch Set 2 : Add explicit content:: namespace due to rebasing. #

Patch Set 3 : Latest rebase. #

Patch Set 4 : Update the tests. #

Total comments: 1

Patch Set 5 : Initialize use_secure_origin_for_test_page_ in only one place. #

Total comments: 3

Patch Set 6 : Remove ExpectedPromptBehaviour in favor of GetUserMediaAndExpectAuto{Accept/Deny}WithoutPrompt() me… #

Patch Set 7 : Try re-enabling DenyingMicDoesNotCauseStickyDenyForCameras on Windows debug builds. #

Patch Set 8 : Don't require a prompt to be shown for OpenPageAndGetUserMediaInNewTabWithConstraints(). #

Patch Set 9 : Run `git cl format` again. #

Total comments: 6

Patch Set 10 : Address LGTM nits. #

Patch Set 11 : Fix incorrect test code that I accidentally committed. #

Unified diffs Side-by-side diffs Delta from patch set Stats (+176 lines, -39 lines) Patch
M chrome/browser/media/chrome_media_stream_infobar_browsertest.cc View 1 2 3 4 5 6 7 8 9 10 7 chunks +66 lines, -25 lines 0 comments Download
M chrome/browser/media/desktop_capture_access_handler.cc View 1 2 3 4 5 6 7 8 9 3 chunks +4 lines, -4 lines 0 comments Download
M chrome/browser/media/media_stream_device_permissions.cc View 1 2 3 4 5 6 7 8 9 2 chunks +2 lines, -5 lines 0 comments Download
M chrome/browser/media/media_stream_devices_controller.cc View 1 2 3 3 chunks +3 lines, -2 lines 0 comments Download
M chrome/browser/media/media_stream_infobar_delegate.cc View 1 2 3 2 chunks +2 lines, -1 line 0 comments Download
M chrome/browser/media/webrtc_browsertest_base.h View 1 2 3 4 5 6 7 8 2 chunks +7 lines, -0 lines 0 comments Download
M chrome/browser/media/webrtc_browsertest_base.cc View 1 2 3 4 5 6 7 8 9 5 chunks +92 lines, -2 lines 0 comments Download

Messages

Total messages: 62 (29 generated)
lgarron
tommi@: These changes are the same ones from https://codereview.chromium.org/1099453005/ moved into their own CL. Would ...
5 years, 7 months ago (2015-05-08 22:17:00 UTC) #2
tommi (sloooow) - chröme
lgtm
5 years, 7 months ago (2015-05-10 05:54:57 UTC) #4
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1132203002/1
5 years, 7 months ago (2015-05-10 05:56:18 UTC) #5
commit-bot: I haz the power
Try jobs failed on following builders: linux_android_rel_ng on tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_android_rel_ng/builds/21193)
5 years, 7 months ago (2015-05-10 08:25:43 UTC) #7
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1132203002/20001
5 years, 7 months ago (2015-05-11 19:54:37 UTC) #10
commit-bot: I haz the power
Try jobs failed on following builders: linux_chromium_gn_dbg on tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_gn_dbg/builds/70676) linux_chromium_gn_rel on tryserver.chromium.linux (JOB_FAILED, ...
5 years, 7 months ago (2015-05-11 20:01:31 UTC) #12
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1132203002/40001
5 years, 7 months ago (2015-05-11 22:53:24 UTC) #17
commit-bot: I haz the power
Try jobs failed on following builders: linux_chromium_chromeos_rel_ng on tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_chromeos_rel_ng/builds/56189) linux_chromium_rel_ng on tryserver.chromium.linux (JOB_FAILED, ...
5 years, 7 months ago (2015-05-12 00:18:02 UTC) #19
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1132203002/40001
5 years, 7 months ago (2015-05-12 01:43:01 UTC) #21
commit-bot: I haz the power
Try jobs failed on following builders: linux_chromium_chromeos_rel_ng on tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_chromeos_rel_ng/builds/56287)
5 years, 7 months ago (2015-05-12 02:55:07 UTC) #23
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1132203002/40001
5 years, 7 months ago (2015-05-12 18:41:37 UTC) #26
commit-bot: I haz the power
Try jobs failed on following builders: linux_chromium_chromeos_rel_ng on tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_chromeos_rel_ng/builds/56571) linux_chromium_rel_ng on tryserver.chromium.linux (JOB_FAILED, ...
5 years, 7 months ago (2015-05-12 20:00:43 UTC) #28
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1132203002/40001
5 years, 7 months ago (2015-05-14 19:09:35 UTC) #31
commit-bot: I haz the power
Try jobs failed on following builders: linux_chromium_chromeos_rel_ng on tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_chromeos_rel_ng/builds/57557)
5 years, 7 months ago (2015-05-14 20:23:35 UTC) #33
lgarron
On 2015/05/14 at 20:23:35, commit-bot wrote: > Try jobs failed on following builders: > linux_chromium_chromeos_rel_ng ...
5 years, 7 months ago (2015-05-15 00:16:06 UTC) #34
lgarron
On 2015/05/15 at 00:16:06, lgarron wrote: > On 2015/05/14 at 20:23:35, commit-bot wrote: > > ...
5 years, 4 months ago (2015-07-28 18:32:41 UTC) #35
lgarron
On 2015/07/28 at 18:32:41, lgarron wrote: > On 2015/05/15 at 00:16:06, lgarron wrote: > > ...
5 years, 4 months ago (2015-07-28 18:33:05 UTC) #36
lgarron
It's been a long delay (because I was prioritizing my DevTools work over this), but ...
5 years, 4 months ago (2015-08-04 01:22:38 UTC) #37
tommi (sloooow) - chröme
lgtm https://codereview.chromium.org/1132203002/diff/80001/chrome/browser/media/media_stream_devices_controller.cc File chrome/browser/media/media_stream_devices_controller.cc (right): https://codereview.chromium.org/1132203002/diff/80001/chrome/browser/media/media_stream_devices_controller.cc#newcode445 chrome/browser/media/media_stream_devices_controller.cc:445: IsUserAcceptAllowed(content_type)) nit: use {}
5 years, 4 months ago (2015-08-04 09:09:26 UTC) #38
felt
https://codereview.chromium.org/1132203002/diff/100001/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc File chrome/browser/media/chrome_media_stream_infobar_browsertest.cc (right): https://codereview.chromium.org/1132203002/diff/100001/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc#newcode165 chrome/browser/media/chrome_media_stream_infobar_browsertest.cc:165: EXPECT_TRUE(GetUserMediaAndAccept(tab_contents, EXPECT_PROMPT_NOT_SHOWN)); This seems weird. The name of the ...
5 years, 4 months ago (2015-08-04 13:42:26 UTC) #40
lgarron
https://codereview.chromium.org/1132203002/diff/100001/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc File chrome/browser/media/chrome_media_stream_infobar_browsertest.cc (right): https://codereview.chromium.org/1132203002/diff/100001/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc#newcode165 chrome/browser/media/chrome_media_stream_infobar_browsertest.cc:165: EXPECT_TRUE(GetUserMediaAndAccept(tab_contents, EXPECT_PROMPT_NOT_SHOWN)); On 2015/08/04 at 13:42:26, felt wrote: > ...
5 years, 4 months ago (2015-08-04 18:02:41 UTC) #41
lgarron
https://codereview.chromium.org/1132203002/diff/100001/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc File chrome/browser/media/chrome_media_stream_infobar_browsertest.cc (right): https://codereview.chromium.org/1132203002/diff/100001/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc#newcode165 chrome/browser/media/chrome_media_stream_infobar_browsertest.cc:165: EXPECT_TRUE(GetUserMediaAndAccept(tab_contents, EXPECT_PROMPT_NOT_SHOWN)); On 2015/08/04 at 18:02:41, lgarron wrote: > ...
5 years, 4 months ago (2015-08-04 20:15:44 UTC) #42
raymes
lgtm https://codereview.chromium.org/1132203002/diff/180001/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc File chrome/browser/media/chrome_media_stream_infobar_browsertest.cc (right): https://codereview.chromium.org/1132203002/diff/180001/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc#newcode36 chrome/browser/media/chrome_media_stream_infobar_browsertest.cc:36: // https://www.chromium.org/Home/chromium-security/prefer-secure-origins-for-powerful-new-features nit: should this be broken across ...
5 years, 4 months ago (2015-08-05 02:31:05 UTC) #44
felt
lgtm % nit (and make sure to fix raymes's comment about rebasing, too) https://codereview.chromium.org/1132203002/diff/180001/chrome/browser/media/webrtc_browsertest_base.cc File ...
5 years, 4 months ago (2015-08-06 18:40:13 UTC) #45
lgarron
https://codereview.chromium.org/1132203002/diff/180001/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc File chrome/browser/media/chrome_media_stream_infobar_browsertest.cc (right): https://codereview.chromium.org/1132203002/diff/180001/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc#newcode36 chrome/browser/media/chrome_media_stream_infobar_browsertest.cc:36: // https://www.chromium.org/Home/chromium-security/prefer-secure-origins-for-powerful-new-features On 2015/08/05 at 02:31:05, raymes wrote: > ...
5 years, 4 months ago (2015-08-06 22:10:09 UTC) #46
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1132203002/200001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1132203002/200001
5 years, 4 months ago (2015-08-06 22:12:17 UTC) #49
commit-bot: I haz the power
Try jobs failed on following builders: linux_chromium_asan_rel_ng on tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_asan_rel_ng/builds/36954)
5 years, 4 months ago (2015-08-06 22:55:39 UTC) #51
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1132203002/220001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1132203002/220001
5 years, 4 months ago (2015-08-06 23:07:14 UTC) #54
commit-bot: I haz the power
Try jobs failed on following builders: win_chromium_x64_rel_ng on tryserver.chromium.win (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_x64_rel_ng/builds/87750)
5 years, 4 months ago (2015-08-07 01:20:08 UTC) #56
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1132203002/220001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1132203002/220001
5 years, 4 months ago (2015-08-07 20:27:18 UTC) #58
commit-bot: I haz the power
Committed patchset #11 (id:220001)
5 years, 4 months ago (2015-08-07 22:18:42 UTC) #59
commit-bot: I haz the power
Patchset 11 (id:??) landed as https://crrev.com/2249c80e8c4b50793a8261c4f9eb3f879ddf4aff Cr-Commit-Position: refs/heads/master@{#342458}
5 years, 4 months ago (2015-08-07 22:19:26 UTC) #60
magjed_chromium
5 years, 4 months ago (2015-08-09 15:19:40 UTC) #61
Message was sent while issue was closed.
A revert of this CL (patchset #11 id:220001) has been created in
https://codereview.chromium.org/1276373004/ by magjed@chromium.org.

The reason for reverting is: This CL broke
WebRtcWebcamBrowserTest.TestAcquiringAndReacquiringWebcam on all platforms,
failing on the introduced assert
'EXPECT_TRUE(permissionRequestObserver.request_shown());’ at
webrtc_browsertest_base.cc:149.

Link to bots:
https://build.chromium.org/p/chromium.webrtc/builders/Win7%20Tester
https://build.chromium.org/p/chromium.webrtc/builders/Linux%20Tester
https://build.chromium.org/p/chromium.webrtc/builders/Mac%20Tester

Stdio output:
[ RUN      ]
WebRtcWebcamBrowserTests/WebRtcWebcamBrowserTest.TestAcquiringAndReacquiringWebcam/0
[7391:1799:0807/160702:WARNING:vt_video_decode_accelerator.cc(194)] Failed to
initialize VideoToolbox framework. Hardware accelerated video decoding will be
disabled.
[7388:1799:0807/160703:INFO:CONSOLE(71)] "This appears to be Chrome", source:
http://127.0.0.1:50232/webrtc/adapter.js (71)
[7388:71959:0807/160703:WARNING:embedded_test_server.cc(258)] Request not
handled. Returning 404: /favicon.ico
[7388:1799:0807/160703:INFO:CONSOLE(13)] "Returning has-video-input-device to
test.", source: http://127.0.0.1:50232/webrtc/test_functions.js (13)
[7388:1799:0807/160703:INFO:CONSOLE(13)] "Requesting doGetUserMedia:
constraints:
{"video":{"mandatory":{"minWidth":640,"maxWidth":640,"minHeight":480,"maxHeight":480}}}",
source: http://127.0.0.1:50232/webrtc/test_functions.js (13)
[7388:1799:0807/160703:INFO:CONSOLE(13)] "Returning request-callback-granted to
test.", source: http://127.0.0.1:50232/webrtc/test_functions.js (13)
[7388:1799:0807/160703:INFO:CONSOLE(13)] "Returning ok-got-stream to test.",
source: http://127.0.0.1:50232/webrtc/test_functions.js (13)
[7388:1799:0807/160703:INFO:CONSOLE(13)] "Returning ok-started to test.",
source: http://127.0.0.1:50232/webrtc/test_functions.js (13)
[7388:1799:0807/160703:INFO:CONSOLE(13)] "Returning video-not-playing to test.",
source: http://127.0.0.1:50232/webrtc/test_functions.js (13)
[7388:1799:0807/160703:INFO:CONSOLE(13)] "Returning video-playing to test.",
source: http://127.0.0.1:50232/webrtc/test_functions.js (13)
[7388:1799:0807/160703:INFO:CONSOLE(13)] "Returning ok-640x480 to test.",
source: http://127.0.0.1:50232/webrtc/test_functions.js (13)
[7388:1799:0807/160704:INFO:CONSOLE(13)] "Returning ok-stopped to test.",
source: http://127.0.0.1:50232/webrtc/test_functions.js (13)
[7388:1799:0807/160704:INFO:CONSOLE(13)] "Requesting doGetUserMedia:
constraints:
{"video":{"mandatory":{"minWidth":640,"maxWidth":640,"minHeight":360,"maxHeight":360}}}",
source: http://127.0.0.1:50232/webrtc/test_functions.js (13)
[7388:1799:0807/160704:INFO:CONSOLE(13)] "Returning request-callback-granted to
test.", source: http://127.0.0.1:50232/webrtc/test_functions.js (13)
../../chrome/browser/media/webrtc_browsertest_base.cc:149: Failure
Value of: permissionRequestObserver.request_shown()
  Actual: false
Expected: true
[7388:1799:0807/160704:INFO:CONSOLE(13)] "Returning ok-got-stream to test.",
source: http://127.0.0.1:50232/webrtc/test_functions.js (13)
[7388:1799:0807/160704:INFO:CONSOLE(13)] "Returning ok-started to test.",
source: http://127.0.0.1:50232/webrtc/test_functions.js (13)
[7388:1799:0807/160704:INFO:CONSOLE(13)] "Returning video-not-playing to test.",
source: http://127.0.0.1:50232/webrtc/test_functions.js (13)
[7388:1799:0807/160704:INFO:CONSOLE(13)] "Returning video-playing to test.",
source: http://127.0.0.1:50232/webrtc/test_functions.js (13)
[7388:1799:0807/160704:INFO:CONSOLE(13)] "Returning ok-640x360 to test.",
source: http://127.0.0.1:50232/webrtc/test_functions.js (13)
[7388:1799:0807/160704:INFO:CONSOLE(13)] "Returning ok-stopped to test.",
source: http://127.0.0.1:50232/webrtc/test_functions.js (13)
[  FAILED  ]
WebRtcWebcamBrowserTests/WebRtcWebcamBrowserTest.TestAcquiringAndReacquiringWebcam/0,
where GetParam() = "force-qtkit" (2127 ms).

Powered by Google App Engine
This is Rietveld 408576698