summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstuartmorgan@google.com <stuartmorgan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-10 21:51:19 +0000
committerstuartmorgan@google.com <stuartmorgan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-10 21:51:19 +0000
commita8d9ccbe0582444b3f156981b47bd23589208fc9 (patch)
tree48f180f1565adb50b57c1d07bbaeaadb5db17068
parent1f91d7b98b3bc121a1a046a308b19f9b53e25f24 (diff)
downloadchromium_src-a8d9ccbe0582444b3f156981b47bd23589208fc9.zip
chromium_src-a8d9ccbe0582444b3f156981b47bd23589208fc9.tar.gz
chromium_src-a8d9ccbe0582444b3f156981b47bd23589208fc9.tar.bz2
Add the test plugin to the Mac plugin whitelist
TBR=amanda BUG=none TEST=Happier Mac WebKit test bots. Review URL: http://codereview.chromium.org/165267 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22963 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/glue/plugins/plugin_list_mac.mm5
1 files changed, 3 insertions, 2 deletions
diff --git a/webkit/glue/plugins/plugin_list_mac.mm b/webkit/glue/plugins/plugin_list_mac.mm
index c502ea6..46cb118 100644
--- a/webkit/glue/plugins/plugin_list_mac.mm
+++ b/webkit/glue/plugins/plugin_list_mac.mm
@@ -71,8 +71,9 @@ bool PluginList::ShouldLoadPlugin(const WebPluginInfo& info) {
// Anything using QuickDraw-based drawing, for example, would crash
// immediately.
std::string plugin_name = WideToUTF8(info.name);
- if (!(plugin_name == "Shockwave Flash" || // CG drawing + Carbon events.
- plugin_name == "Picasa")) { // No drawing or event handling.
+ if (!(plugin_name == "WebKit Test PlugIn" || // Test plugin.
+ plugin_name == "Shockwave Flash" || // CG drawing + Carbon events.
+ plugin_name == "Picasa")) { // No drawing or event handling.
return false;
}