Broke ContentSettingBubbleModelTest.Plugins on Android.
commit8b75315a99bb43615b5efbf56734811bf06cd86b
authordbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Fri, 1 Feb 2013 07:49:30 +0000 (1 07:49 +0000)
committerdbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Fri, 1 Feb 2013 07:49:30 +0000 (1 07:49 +0000)
treebb978996cecc4481307b776d60f4687b374a60ee
parente57cc4844f188b59ceafb76110c612a9420b2693
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
16 files changed:
chrome/browser/content_settings/content_settings_browsertest.cc
chrome/browser/plugins/chrome_plugin_service_filter.cc
chrome/browser/plugins/chrome_plugin_service_filter.h
chrome/browser/plugins/plugin_info_message_filter.cc
chrome/browser/plugins/plugin_info_message_filter.h
chrome/browser/plugins/plugin_infobar_delegates.cc
chrome/browser/renderer_host/plugin_info_message_filter_unittest.cc
chrome/browser/tab_contents/render_view_context_menu.cc
chrome/browser/ui/content_settings/content_setting_bubble_model.cc
content/browser/pepper_flash_settings_helper_impl.cc
content/browser/plugin_data_remover_impl.cc
content/browser/plugin_service_impl.cc
content/browser/plugin_service_impl.h
content/browser/plugin_service_impl_browsertest.cc
content/browser/renderer_host/render_message_filter.cc
content/public/browser/plugin_service_filter.h