diff options
| author | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-01 07:49:30 +0000 |
|---|---|---|
| committer | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-01 07:49:30 +0000 |
| commit | 8b75315a99bb43615b5efbf56734811bf06cd86b (patch) | |
| tree | bb978996cecc4481307b776d60f4687b374a60ee /chrome/browser/content_settings | |
| parent | e57cc4844f188b59ceafb76110c612a9420b2693 (diff) | |
| download | chromium_src-8b75315a99bb43615b5efbf56734811bf06cd86b.zip chromium_src-8b75315a99bb43615b5efbf56734811bf06cd86b.tar.gz chromium_src-8b75315a99bb43615b5efbf56734811bf06cd86b.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/content_settings')
| -rw-r--r-- | chrome/browser/content_settings/content_settings_browsertest.cc | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/chrome/browser/content_settings/content_settings_browsertest.cc b/chrome/browser/content_settings/content_settings_browsertest.cc index d87dcb5..976364a 100644 --- a/chrome/browser/content_settings/content_settings_browsertest.cc +++ b/chrome/browser/content_settings/content_settings_browsertest.cc @@ -10,7 +10,6 @@ #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/content_settings/tab_specific_content_settings.h" #include "chrome/browser/net/url_request_mock_util.h" -#include "chrome/browser/plugins/chrome_plugin_service_filter.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" @@ -20,8 +19,6 @@ #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/browser_thread.h" -#include "content/public/browser/plugin_service.h" -#include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/content_switches.h" @@ -316,12 +313,6 @@ IN_PROC_BROWSER_TEST_F(ClickToPlayPluginTest, Basic) { content::RenderViewHost* host = browser()->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost(); - ChromePluginServiceFilter* filter = ChromePluginServiceFilter::GetInstance(); - int process_id = host->GetProcess()->GetID(); - FilePath path(FILE_PATH_LITERAL("blah")); - EXPECT_FALSE(filter->CanLoadPlugin(process_id, path)); - filter->AuthorizeAllPlugins(process_id); - EXPECT_TRUE(filter->CanLoadPlugin(process_id, path)); host->Send(new ChromeViewMsg_LoadBlockedPlugins( host->GetRoutingID(), std::string())); @@ -382,8 +373,6 @@ IN_PROC_BROWSER_TEST_F(ClickToPlayPluginTest, LoadAllBlockedPlugins) { content::RenderViewHost* host = browser()->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost(); - ChromePluginServiceFilter::GetInstance()->AuthorizeAllPlugins( - host->GetProcess()->GetID()); host->Send(new ChromeViewMsg_LoadBlockedPlugins( host->GetRoutingID(), std::string())); EXPECT_EQ(expected_title1, title_watcher1.WaitAndGetTitle()); @@ -417,8 +406,6 @@ IN_PROC_BROWSER_TEST_F(ClickToPlayPluginTest, NoCallbackAtLoad) { content::RenderViewHost* host = browser()->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost(); - ChromePluginServiceFilter::GetInstance()->AuthorizeAllPlugins( - host->GetProcess()->GetID()); host->Send(new ChromeViewMsg_LoadBlockedPlugins( host->GetRoutingID(), std::string())); @@ -439,8 +426,6 @@ IN_PROC_BROWSER_TEST_F(ClickToPlayPluginTest, DeleteSelfAtLoad) { content::RenderViewHost* host = browser()->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost(); - ChromePluginServiceFilter::GetInstance()->AuthorizeAllPlugins( - host->GetProcess()->GetID()); host->Send(new ChromeViewMsg_LoadBlockedPlugins( host->GetRoutingID(), std::string())); |