diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-18 01:08:45 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-18 01:08:45 +0000 |
| commit | 6096465ed87e558f5ffa5801c1e865864ac56d22 (patch) | |
| tree | 9149fa9db5a0bc40261bd689cb68b7274af9c7ae /webkit/tools/test_shell/test_shell_mac.mm | |
| parent | 626861919dd6f575b4a920a9ed91b7cdd5c94ace (diff) | |
| download | chromium_src-6096465ed87e558f5ffa5801c1e865864ac56d22.zip chromium_src-6096465ed87e558f5ffa5801c1e865864ac56d22.tar.gz chromium_src-6096465ed87e558f5ffa5801c1e865864ac56d22.tar.bz2 | |
Make sure the upstream layout test plugin is disabled in test_shell.
We're going to be putting both copies of the layout test plugin in
{Debug,Release}/plugins, so we need to blacklist the one we're not
using.
Once the upstream plugin is working, I will switch this to blacklist
the chromium forked version.
Review URL: http://codereview.chromium.org/5120001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66563 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/test_shell_mac.mm')
| -rw-r--r-- | webkit/tools/test_shell/test_shell_mac.mm | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/webkit/tools/test_shell/test_shell_mac.mm b/webkit/tools/test_shell/test_shell_mac.mm index 30eab0f..88021e9 100644 --- a/webkit/tools/test_shell/test_shell_mac.mm +++ b/webkit/tools/test_shell/test_shell_mac.mm @@ -730,10 +730,6 @@ base::StringPiece GetDataResource(int resource_id) { return base::StringPiece(); } -void GetPlugins(bool refresh, std::vector<WebPluginInfo>* plugins) { - NPAPI::PluginList::Singleton()->GetPlugins(refresh, plugins); -} - bool DownloadUrl(const std::string& url, NSWindow* caller_window) { return false; } |