Bug 500660 - Don't load XPT files from plugin directories any more r=josh sr=jst

modules/plugin/base/src/nsPluginHostImpl.cpp

@@ -4501,15 +4501,8 @@ NS_IMETHODIMP nsPluginHostImpl::LoadPlugins()
   if (NS_FAILED(rv))
     return rv;
 
-  // only if plugins have changed will we ask XPTI to refresh
+  // only if plugins have changed will we notify plugin-change observers
   if (pluginschanged) {
-    // rescan XPTI to catch any newly installed interfaces
-    nsCOMPtr<nsIInterfaceInfoManager>
-      iim(do_GetService(NS_INTERFACEINFOMANAGER_SERVICE_CONTRACTID));
-
-    if (iim)
-      iim->AutoRegisterInterfaces();
-
     nsCOMPtr<nsIObserverService>
       obsService(do_GetService("@mozilla.org/observer-service;1"));
     if (obsService)

xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp

@@ -252,7 +252,6 @@ PRBool xptiInterfaceInfoManager::BuildFileSearchPath(nsISupportsArray** aPath)
         return PR_FALSE;
     }
 
-    // Add additional plugins dirs
     // No error checking here since this is optional in some embeddings
     
     // Add the GRE's component directory to searchPath if the 
@@ -277,7 +276,6 @@ PRBool xptiInterfaceInfoManager::BuildFileSearchPath(nsISupportsArray** aPath)
     }
 
     (void)AppendFromDirServiceList(NS_XPCOM_COMPONENT_DIR_LIST, searchPath);
-    (void)AppendFromDirServiceList(NS_APP_PLUGINS_DIR_LIST, searchPath);
 
     NS_ADDREF(*aPath = searchPath);
     return PR_TRUE;