summaryrefslogtreecommitdiffstats
path: root/content/browser/plugin_service_impl_browsertest.cc
diff options
context:
space:
mode:
authorjschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-05 06:18:37 +0000
committerjschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-05 06:18:37 +0000
commit6a7c000f9841e3011d428ddc94b15a3fa2904325 (patch)
treefe554260384d56ced6701984f7d3f17760141f74 /content/browser/plugin_service_impl_browsertest.cc
parent62e90ae37c58bf070ebd16752af9bd32f92ab47e (diff)
downloadchromium_src-6a7c000f9841e3011d428ddc94b15a3fa2904325.zip
chromium_src-6a7c000f9841e3011d428ddc94b15a3fa2904325.tar.gz
chromium_src-6a7c000f9841e3011d428ddc94b15a3fa2904325.tar.bz2
Revert 180600
> Follow-on fixes and naming changes for https://codereview.chromium.org/12086077/ > > BUG=172573 > Review URL: https://codereview.chromium.org/12177018 Windows and aura bots are failing, and this is the only CL in range that had no passing try runs for those tests. If the bots don't go green, I'll unrevert the revert. TBR=cevans@chromium.org Review URL: https://codereview.chromium.org/12210009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180620 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/plugin_service_impl_browsertest.cc')
-rw-r--r--content/browser/plugin_service_impl_browsertest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/content/browser/plugin_service_impl_browsertest.cc b/content/browser/plugin_service_impl_browsertest.cc
index 94b929a..0f25185 100644
--- a/content/browser/plugin_service_impl_browsertest.cc
+++ b/content/browser/plugin_service_impl_browsertest.cc
@@ -121,7 +121,7 @@ class MockPluginServiceFilter : public content::PluginServiceFilter {
public:
MockPluginServiceFilter() {}
- virtual bool IsPluginAvailable(
+ virtual bool IsPluginEnabled(
int render_process_id,
int render_view_id,
const void* context,