8b75315a99bb43615b5efbf56734811bf06cd86b - chromium/src

commit	8b75315a99bb43615b5efbf56734811bf06cd86b	[log] [tgz]
author	dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	Fri Feb 01 07:49:30 2013
committer	dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	Fri Feb 01 07:49:30 2013
tree	bb978996cecc4481307b776d60f4687b374a60ee
parent	e57cc4844f188b59ceafb76110c612a9420b2693 [diff]

Broke ContentSettingBubbleModelTest.Plugins on Android.

Revert 180103 - 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.

BUG=172573
Review URL: https://codereview.chromium.org/12086077

TBR=cevans@chromium.org
Review URL: https://chromiumcodereview.appspot.com/12114045

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180110 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/content_settings/content_settings_browsertest.cc[diff]
chrome/browser/plugins/chrome_plugin_service_filter.cc[diff]
chrome/browser/plugins/chrome_plugin_service_filter.h[diff]
chrome/browser/plugins/plugin_info_message_filter.cc[diff]
chrome/browser/plugins/plugin_info_message_filter.h[diff]
chrome/browser/plugins/plugin_infobar_delegates.cc[diff]
chrome/browser/renderer_host/plugin_info_message_filter_unittest.cc[diff]
chrome/browser/tab_contents/render_view_context_menu.cc[diff]
chrome/browser/ui/content_settings/content_setting_bubble_model.cc[diff]
content/browser/pepper_flash_settings_helper_impl.cc[diff]
content/browser/plugin_data_remover_impl.cc[diff]
content/browser/plugin_service_impl.cc[diff]
content/browser/plugin_service_impl.h[diff]
content/browser/plugin_service_impl_browsertest.cc[diff]
content/browser/renderer_host/render_message_filter.cc[diff]
content/public/browser/plugin_service_filter.h[diff]

16 files changed