angler-fishThe Vulnerability History Project

Only permit plug-in loads in the browser if the plug-in isn't blocked or the

      user has authorized it with a browser-mediated interaction.

(Reland https://codereview.chromium.org/12086077 with Android test tweak)

BUG=172573
R=jam@chromium.org
Review URL: https://codereview.chromium.org/12092107

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180159 0039d316-1c4b-4281-b951-d872f2087c98
by Jody the Dormouse 2013-02-01 18:20:54 UTC
commit 6be31d20e5c3727f136b8dfe06cd7f27ebf898bb
Chromium Fix CVE-2013-0910
chrome/browser/content_settings/content_settings_browsertest.cc
-15
chrome/browser/plugins/chrome_plugin_service_filter.cc
+20 -82
chrome/browser/plugins/chrome_plugin_service_filter.h
+3 -29
chrome/browser/plugins/plugin_info_message_filter.cc
+1 -15
chrome/browser/plugins/plugin_info_message_filter.h
-2
chrome/browser/plugins/plugin_infobar_delegates.cc
+2 -7
chrome/browser/renderer_host/plugin_info_message_filter_unittest.cc
+2 -10
chrome/browser/tab_contents/render_view_context_menu.cc
+1 -10
chrome/browser/ui/content_settings/content_setting_bubble_model.cc
-6
content/browser/pepper_flash_settings_helper_impl.cc
+1 -1
content/browser/plugin_data_remover_impl.cc
+1 -1
content/browser/plugin_service_impl.cc
+5 -25
content/browser/plugin_service_impl.h
+5 -9
content/browser/plugin_service_impl_browsertest.cc
+4 -39
content/browser/renderer_host/render_message_filter.cc
+4 -8
content/public/browser/plugin_service_filter.h
+3 -8
expand_less