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

Issue 2356053002: [HBD] Only use Plugin Content Settings for Flash. (Closed)

Created:
4 years, 3 months ago by tommycli
Modified:
4 years, 2 months ago
CC:
chromium-reviews, jam
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

[HBD] Only use Plugin Content Settings for Flash. All other plugins (PDF, Widevine, Nacl), as well as custom plugins, should be treated as JavaScript. This is because starting in 55, all the Plugin content settings UI surfaces have been renamed the Flash content settings. This is related to the chrome://plugins deprecation. BUG=615738, 647284 Committed: https://crrev.com/5bd02f157d55ecf5c4c97b1161dd4fb5208d0be0 Cr-Commit-Position: refs/heads/master@{#421348}

Patch Set 1 #

Patch Set 2 : fix #

Patch Set 3 : fix up tests #

Patch Set 4 : fix last test #

Patch Set 5 : Accomplish testing by making Power Saver test plugin pretend to be Flash #

Patch Set 6 : remove extra header includes #

Patch Set 7 : fix #

Patch Set 8 : update #

Patch Set 9 : reformat #

Patch Set 10 : merge #

Patch Set 11 : update flash #

Patch Set 12 : set fake flash version to 100.0 #

Patch Set 13 : fix #

Total comments: 11

Patch Set 14 : address comments #

Patch Set 15 : add comment #

Patch Set 16 : set upstream #

Patch Set 17 : Fix last test #

Patch Set 18 : fix prerender tests #

Total comments: 16

Patch Set 19 : address comments fix tests #

Patch Set 20 : Merge branch 'master' of https://chromium.googlesource.com/chromium/src into 281-hbd-plugin-setting… #

Patch Set 21 : fix one more test #

Total comments: 2

Patch Set 22 : address xhwang comments #

Unified diffs Side-by-side diffs Delta from patch set Stats (+156 lines, -139 lines) Patch
M chrome/browser/content_settings/content_settings_browsertest.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 11 chunks +24 lines, -30 lines 0 comments Download
M chrome/browser/plugins/plugin_info_message_filter_unittest.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 2 chunks +10 lines, -3 lines 0 comments Download
M chrome/browser/plugins/plugin_power_saver_browsertest.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 18 chunks +53 lines, -49 lines 0 comments Download
M chrome/browser/prerender/prerender_browsertest.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 4 chunks +22 lines, -2 lines 0 comments Download
M chrome/browser/prerender/prerender_test_utils.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 1 chunk +1 line, -4 lines 0 comments Download
M chrome/common/plugin_utils.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 1 chunk +10 lines, -25 lines 0 comments Download
M chrome/renderer/plugins/power_saver_info.cc View 1 2 3 4 1 chunk +1 line, -2 lines 0 comments Download
D chrome/test/data/load_clearkey_no_js.html View 1 2 3 4 1 chunk +0 lines, -10 lines 0 comments Download
A + chrome/test/data/load_flash_no_js.html View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 1 chunk +1 line, -1 line 0 comments Download
M chrome/test/data/load_pepper_plugin.html View 1 2 3 4 5 6 7 8 9 10 11 12 13 2 chunks +4 lines, -3 lines 0 comments Download
M chrome/test/data/prerender/prerender_plugin_delay_load.html View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 1 chunk +1 line, -1 line 0 comments Download
M chrome/test/data/prerender/prerender_plugin_power_saver.html View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 1 chunk +2 lines, -1 line 0 comments Download
M content/public/common/content_switches.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 1 chunk +0 lines, -1 line 0 comments Download
M content/public/test/ppapi_test_utils.h View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 1 chunk +2 lines, -3 lines 0 comments Download
M content/public/test/ppapi_test_utils.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 2 chunks +21 lines, -3 lines 0 comments Download
M content/test/BUILD.gn View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 1 chunk +4 lines, -1 line 0 comments Download

Dependent Patchsets:

Messages

Total messages: 117 (91 generated)
tommycli
raymes: PTAL, does this accurately reflect our discussion in the linked bug? thanks.
4 years, 3 months ago (2016-09-20 23:56:53 UTC) #8
tommycli
On 2016/09/20 23:56:53, tommycli wrote: > raymes: PTAL, does this accurately reflect our discussion in ...
4 years, 3 months ago (2016-09-21 00:38:23 UTC) #11
raymes
On that note - do you know if there is a way to get flash ...
4 years, 3 months ago (2016-09-21 05:45:35 UTC) #12
raymes
Cool, I think this is a good approach.
4 years, 3 months ago (2016-09-21 06:54:10 UTC) #13
raymes
lgtm
4 years, 3 months ago (2016-09-21 06:54:42 UTC) #14
tommycli
On 2016/09/21 05:45:35, raymes wrote: > On that note - do you know if there ...
4 years, 3 months ago (2016-09-21 16:50:05 UTC) #15
tommycli
raymes: PTAL again. The consequence of this change is that a bunch of tests (that ...
4 years, 3 months ago (2016-09-21 19:26:09 UTC) #22
raymes
Would another option be to change plugin_filter_utils.cc to use the plugins setting for Flash+Test plugins?
4 years, 3 months ago (2016-09-22 00:44:30 UTC) #25
tommycli
On 2016/09/22 00:44:30, raymes wrote: > Would another option be to change plugin_filter_utils.cc to use ...
4 years, 2 months ago (2016-09-23 21:15:55 UTC) #38
tommycli
jochen: PTAL, thanks!
4 years, 2 months ago (2016-09-23 21:16:12 UTC) #40
raymes
lg - just a few nits/questions https://codereview.chromium.org/2356053002/diff/240001/chrome/browser/content_settings/content_settings_browsertest.cc File chrome/browser/content_settings/content_settings_browsertest.cc (left): https://codereview.chromium.org/2356053002/diff/240001/chrome/browser/content_settings/content_settings_browsertest.cc#oldcode50 chrome/browser/content_settings/content_settings_browsertest.cc:50: #if defined(ENABLE_PEPPER_CDMS) I'm ...
4 years, 2 months ago (2016-09-26 08:18:30 UTC) #59
jochen (gone - plz use gerrit)
+battre. So we'll force users to block cookies if they don't like nacl plugins?
4 years, 2 months ago (2016-09-26 15:07:57 UTC) #61
battre
On 2016/09/26 15:07:57, jochen (slow) wrote: > +battre. > > So we'll force users to ...
4 years, 2 months ago (2016-09-26 15:17:20 UTC) #62
tommycli
xhwang: PTAL below, thanks! https://codereview.chromium.org/2356053002/diff/240001/chrome/browser/content_settings/content_settings_browsertest.cc File chrome/browser/content_settings/content_settings_browsertest.cc (left): https://codereview.chromium.org/2356053002/diff/240001/chrome/browser/content_settings/content_settings_browsertest.cc#oldcode50 chrome/browser/content_settings/content_settings_browsertest.cc:50: #if defined(ENABLE_PEPPER_CDMS) On 2016/09/26 08:18:29, ...
4 years, 2 months ago (2016-09-26 16:29:44 UTC) #64
tommycli
On 2016/09/26 15:17:20, battre wrote: > On 2016/09/26 15:07:57, jochen (slow) wrote: > > +battre. ...
4 years, 2 months ago (2016-09-26 16:38:28 UTC) #65
xhwang
I didn't review everything. I have a few comment related to the CDM and general ...
4 years, 2 months ago (2016-09-26 23:44:51 UTC) #84
raymes
https://codereview.chromium.org/2356053002/diff/240001/chrome/browser/prerender/prerender_browsertest.cc File chrome/browser/prerender/prerender_browsertest.cc (right): https://codereview.chromium.org/2356053002/diff/240001/chrome/browser/prerender/prerender_browsertest.cc#newcode608 chrome/browser/prerender/prerender_browsertest.cc:608: ASSERT_TRUE(ppapi::RegisterPowerSaverTestPlugin(command_line)); On 2016/09/26 08:18:29, raymes wrote: > Hmm why ...
4 years, 2 months ago (2016-09-27 01:31:18 UTC) #85
battre
On 2016/09/26 16:38:28, tommycli wrote: > On 2016/09/26 15:17:20, battre wrote: > > On 2016/09/26 ...
4 years, 2 months ago (2016-09-27 07:45:49 UTC) #86
tommycli
Thanks all! This is ready for another look! I changed all the x-ppapi-tests to x-shockwave-flash ...
4 years, 2 months ago (2016-09-27 18:51:07 UTC) #96
jochen (gone - plz use gerrit)
lgtm
4 years, 2 months ago (2016-09-27 19:36:04 UTC) #97
tommycli
On 2016/09/27 19:36:04, jochen (slow) wrote: > lgtm jochen: thanks! xhwang: Did the latest patchset ...
4 years, 2 months ago (2016-09-27 20:06:12 UTC) #100
xhwang
Thanks. LGTM % some more nits/comments. https://codereview.chromium.org/2356053002/diff/340001/chrome/browser/content_settings/content_settings_browsertest.cc File chrome/browser/content_settings/content_settings_browsertest.cc (right): https://codereview.chromium.org/2356053002/diff/340001/chrome/browser/content_settings/content_settings_browsertest.cc#newcode524 chrome/browser/content_settings/content_settings_browsertest.cc:524: #endif // defined(WIDEVINE_CDM_AVAILABLE) ...
4 years, 2 months ago (2016-09-27 20:35:26 UTC) #103
tommycli
xhwang: thank you! https://codereview.chromium.org/2356053002/diff/340001/chrome/browser/content_settings/content_settings_browsertest.cc File chrome/browser/content_settings/content_settings_browsertest.cc (right): https://codereview.chromium.org/2356053002/diff/340001/chrome/browser/content_settings/content_settings_browsertest.cc#newcode524 chrome/browser/content_settings/content_settings_browsertest.cc:524: #endif // defined(WIDEVINE_CDM_AVAILABLE) On 2016/09/27 20:35:26, ...
4 years, 2 months ago (2016-09-27 20:45:38 UTC) #106
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2356053002/440001
4 years, 2 months ago (2016-09-27 21:47:30 UTC) #113
commit-bot: I haz the power
Committed patchset #22 (id:440001)
4 years, 2 months ago (2016-09-27 21:53:29 UTC) #114
commit-bot: I haz the power
4 years, 2 months ago (2016-09-27 21:56:49 UTC) #116
Message was sent while issue was closed.
Patchset 22 (id:??) landed as
https://crrev.com/5bd02f157d55ecf5c4c97b1161dd4fb5208d0be0
Cr-Commit-Position: refs/heads/master@{#421348}

Powered by Google App Engine
This is Rietveld 408576698