From eff509e04d32963efb24440447d4fe7fcef37ad2 Mon Sep 17 00:00:00 2001
From: "bnesse%netscape.com"
 <bnesse%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 20 Sep 2002 18:47:49 +0000
Subject: [PATCH] Fix for bug 164925. Remove unused directory key and support
 code. r=ccarlen, sr=beard.

git-svn-id: svn://10.0.0.236/trunk@130161 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../plugin/base/src/nsPluginHostImpl.cpp      | 20 ++-----------------
 mozilla/xpcom/io/nsDirectoryServiceDefs.h     |  2 --
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
index 719f47b819e..9f57ca68016 100644
--- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
+++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
@@ -5058,7 +5058,7 @@ nsresult nsPluginHostImpl::FindPlugins(PRBool aCreatePluginList, PRBool * aPlugi
   // possible reset in subsequent ScanPluginsDirectory calls
   PRBool pluginschanged = PR_FALSE;
 
-  // 1. Scan the app-defined list of plugin dirs.
+  // Scan the app-defined list of plugin dirs.
   rv = dirService->Get(NS_APP_PLUGINS_DIR_LIST, NS_GET_IID(nsISimpleEnumerator), getter_AddRefs(dirList));
   if (NS_SUCCEEDED(rv)) {
     ScanPluginsDirectoryList(dirList, compManager, aCreatePluginList, &pluginschanged);
@@ -5074,27 +5074,11 @@ nsresult nsPluginHostImpl::FindPlugins(PRBool aCreatePluginList, PRBool * aPlugi
     }
   }
     
-  // 2. Scan the system-defined list of plugin dirs
-  rv = dirService->Get(NS_OS_PLUGINS_DIR_LIST, NS_GET_IID(nsISimpleEnumerator), getter_AddRefs(dirList));
-  if (NS_SUCCEEDED(rv)) {
-    ScanPluginsDirectoryList(dirList, compManager, aCreatePluginList, &pluginschanged);
-
-    if (pluginschanged)
-      *aPluginsChanged = PR_TRUE;
-
-    // if we are just looking for possible changes, 
-    // no need to proceed if changes are detected
-    if (!aCreatePluginList && *aPluginsChanged) {
-      ClearCachedPluginInfoList();
-      return NS_OK;
-    }
-  }
-
   mPluginsLoaded = PR_TRUE; // at this point 'some' plugins have been loaded,
                             // the rest is optional
     
 #if defined (XP_WIN)
-  // 3. Scan the installation paths of our popular plugins if the prefs are enabled
+  // Scan the installation paths of our popular plugins if the prefs are enabled
     
   // This table controls the order of scanning
   const char *prefs[] = {NS_WIN_JRE_SCAN_KEY,         nsnull,
diff --git a/mozilla/xpcom/io/nsDirectoryServiceDefs.h b/mozilla/xpcom/io/nsDirectoryServiceDefs.h
index ad50768c243..0532d34b2cb 100755
--- a/mozilla/xpcom/io/nsDirectoryServiceDefs.h
+++ b/mozilla/xpcom/io/nsDirectoryServiceDefs.h
@@ -72,8 +72,6 @@
     #define NS_OS_SYSTEM_DIR                    "SysD"
 #endif
 
-#define NS_OS_PLUGINS_DIR_LIST                  "OSPluginsDL"
-
 // for MacOSX we need the UNIX entries, plus the MAC entries
 #if defined (XP_UNIX) || defined(XP_MACOSX)
     #define NS_UNIX_LOCAL_DIR                   "Locl"