summaryrefslogtreecommitdiffstats
path: root/content/shell
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2016-03-01 18:36:10 -0800
committerCommit bot <commit-bot@chromium.org>2016-03-02 02:37:35 +0000
commitc70b36ecb934e3b23769028495c4c13c9aa5e550 (patch)
tree301bf5c3fd2f91e2a2673209e00a3fd2e0b1d1ce /content/shell
parenta5e91c5d8f91db97acfe02fafbede56eaff3dbf2 (diff)
downloadchromium_src-c70b36ecb934e3b23769028495c4c13c9aa5e550.zip
chromium_src-c70b36ecb934e3b23769028495c4c13c9aa5e550.tar.gz
chromium_src-c70b36ecb934e3b23769028495c4c13c9aa5e550.tar.bz2
Implement a test plugin for testing deprecated/private PPAPI interfaces.
Unfortunately, there's still a few legacy consumers of these APIs. It's important to continue testing these to make sure there are no security or stability regressions. For now, only http/tests/plugins/cross-frame-object-access.html has been ported over to use the new plugin. BUG=474535 Review URL: https://codereview.chromium.org/1750783002 Cr-Commit-Position: refs/heads/master@{#378664}
Diffstat (limited to 'content/shell')
-rw-r--r--content/shell/BUILD.gn1
-rw-r--r--content/shell/browser/shell_plugin_service_filter.cc1
2 files changed, 2 insertions, 0 deletions
diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn
index c08ecfc..3606271 100644
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -249,6 +249,7 @@ static_library("content_shell_lib") {
if (enable_plugins) {
deps += [
"//content/ppapi_plugin",
+ "//ppapi:blink_deprecated_test_plugin",
"//ppapi:blink_test_plugin",
]
}
diff --git a/content/shell/browser/shell_plugin_service_filter.cc b/content/shell/browser/shell_plugin_service_filter.cc
index 204bb99..7255c1b 100644
--- a/content/shell/browser/shell_plugin_service_filter.cc
+++ b/content/shell/browser/shell_plugin_service_filter.cc
@@ -21,6 +21,7 @@ bool ShellPluginServiceFilter::IsPluginAvailable(
const GURL& policy_url,
WebPluginInfo* plugin) {
return plugin->name == base::ASCIIToUTF16("Blink Test Plugin") ||
+ plugin->name == base::ASCIIToUTF16("Blink Deprecated Test Plugin") ||
plugin->name == base::ASCIIToUTF16("WebKit Test PlugIn");
}