Backed out changeset e2c917e0bc31 (bug 671804) because of xpcshell orange

js/src/xpconnect/shell/xpcshell.cpp

@@ -2078,15 +2078,6 @@ XPCShellDirProvider::GetFile(const char *prop, PRBool *persistent,
         *persistent = PR_TRUE;
         NS_ADDREF(*result = mGREDir);
         return NS_OK;
-    } else if (mGREDir && !strcmp(prop, NS_APP_PREF_DEFAULTS_50_DIR)) {
-        nsCOMPtr<nsIFile> file;
-        *persistent = PR_TRUE;
-        if (NS_FAILED(mGREDir->Clone(getter_AddRefs(file))) ||
-            NS_FAILED(file->AppendNative(NS_LITERAL_CSTRING("defaults"))) ||
-            NS_FAILED(file->AppendNative(NS_LITERAL_CSTRING("pref"))))
-            return NS_ERROR_FAILURE;
-        NS_ADDREF(*result = file);
-        return NS_OK;
     }
 
     return NS_ERROR_FAILURE;
@@ -2109,18 +2100,6 @@ XPCShellDirProvider::GetFiles(const char *prop, nsISimpleEnumerator* *result)
             dirs.AppendObject(file);
 
         return NS_NewArrayEnumerator(result, dirs);
-    } else if (!strcmp(prop, NS_APP_PREFS_DEFAULTS_DIR_LIST)) {
-        nsCOMArray<nsIFile> dirs;
-
-        nsCOMPtr<nsIFile> file;
-        if (NS_FAILED(NS_GetSpecialDirectory(NS_XPCOM_CURRENT_PROCESS_DIR,
-                                             getter_AddRefs(file))) ||
-            NS_FAILED(file->AppendNative(NS_LITERAL_CSTRING("defaults"))) ||
-            NS_FAILED(file->AppendNative(NS_LITERAL_CSTRING("preferences"))))
-            return NS_ERROR_FAILURE;
-
-        dirs.AppendObject(file);
-        return NS_NewArrayEnumerator(result, dirs);
     }
     return NS_ERROR_FAILURE;
 }