Do the SCons hackery necessary to get the test plugin in the right directory.

Review URL: http://codereview.chromium.org/18696


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8530 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 3 deletions

diff --git a/webkit/glue/plugins/plugin_list_linux.cc b/webkit/glue/plugins/plugin_list_linux.cc
index 01b6457..3653a0c 100644
--- a/webkit/glue/plugins/plugin_list_linux.cc
+++ b/webkit/glue/plugins/plugin_list_linux.cc
@@ -8,6 +8,7 @@
 
 #include "base/file_util.h"
 #include "base/logging.h"
+#include "base/path_service.h"
 
 namespace NPAPI {
 
@@ -15,13 +16,18 @@ void PluginList::PlatformInit() {
 }
 
 void PluginList::GetPluginDirectories(std::vector<FilePath>* plugin_dirs) {
-  NOTIMPLEMENTED();
+  // For now, just look in the plugins/ under the exe directory.
+  // TODO(port): this is not correct.  Rather than getting halfway there,
+  // this is a one-off and its replacement should follow Firefox exactly.
+  FilePath dir;
+  PathService::Get(base::DIR_EXE, &dir);
+  plugin_dirs->push_back(dir.Append("plugins"));
 }
 
 void PluginList::LoadPluginsFromDir(const FilePath& path) {
   file_util::FileEnumerator enumerator(path,
                                        false, // not recursive
-                                       file_util::FileEnumerator::DIRECTORIES);
+                                       file_util::FileEnumerator::FILES);
   for (FilePath path = enumerator.Next(); !path.value().empty();
        path = enumerator.Next()) {
     LoadPlugin(path);
@@ -35,7 +41,6 @@ bool PluginList::ShouldLoadPlugin(const WebPluginInfo& info) {
 
 void PluginList::LoadInternalPlugins() {
   // none for now
-  NOTIMPLEMENTED();
 }
 
 } // namespace NPAPI