summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-19 23:47:17 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-19 23:47:17 +0000
commite07594f7947be07a671d4458deb4d15ce08417f1 (patch)
treed129f39d8a92ac595b2bd67d090d854626b75fdb /webkit
parentdd074ec9c25e27cdd1d0d192150fdf608dbce818 (diff)
downloadchromium_src-e07594f7947be07a671d4458deb4d15ce08417f1.zip
chromium_src-e07594f7947be07a671d4458deb4d15ce08417f1.tar.gz
chromium_src-e07594f7947be07a671d4458deb4d15ce08417f1.tar.bz2
Stop loading plugins from {Debug,Release}/plugins on mac TestShell.
We're not ready for this yet. Review URL: http://codereview.chromium.org/3874003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63132 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/test_shell/test_shell_mac.mm11
1 files changed, 7 insertions, 4 deletions
diff --git a/webkit/tools/test_shell/test_shell_mac.mm b/webkit/tools/test_shell/test_shell_mac.mm
index 55dba48..e2cd61d 100644
--- a/webkit/tools/test_shell/test_shell_mac.mm
+++ b/webkit/tools/test_shell/test_shell_mac.mm
@@ -243,12 +243,15 @@ void TestShell::InitializeTestShell(bool layout_test_mode,
}
}
+ // TODO(tony): We're not ready for this yet. If we include this plugin
+ // path, we end up loading both copies of TestNetscapePlugin. Once we
+ // deprecate the old plugin, we can add this path.
// Add <app bundle's parent dir>/plugins to the plugin path so we can load
// test plugins.
- FilePath plugins_dir;
- PathService::Get(base::DIR_EXE, &plugins_dir);
- plugins_dir = plugins_dir.AppendASCII("../../../plugins");
- NPAPI::PluginList::Singleton()->AddExtraPluginDir(plugins_dir);
+ //FilePath plugins_dir;
+ //PathService::Get(base::DIR_EXE, &plugins_dir);
+ //plugins_dir = plugins_dir.AppendASCII("../../../plugins");
+ //NPAPI::PluginList::Singleton()->AddExtraPluginDir(plugins_dir);
}
NSButton* MakeTestButton(NSRect* rect, NSString* title, NSView* parent) {