Bug 1418953 - Remove NS_APP_USER_SEARCH_DIR. r=florian
authorMichael Kaply <mozilla@kaply.com>
Tue, 24 Apr 2018 15:19:47 -0500
changeset 787784 0dd618ec0930e896640c2ebcf81e2d5e2daea34a
parent 787783 290da68a04a4fb67a28ca690a9b185a7fed8a3a2
child 787785 2a51222fb8239a736ddb8f8887d4fbc743434fab
push id107796
push userbmo:emilio@crisal.io
push dateWed, 25 Apr 2018 10:57:04 +0000
reviewersflorian
bugs1418953
milestone61.0a1
Bug 1418953 - Remove NS_APP_USER_SEARCH_DIR. r=florian MozReview-Commit-ID: DYzdJtz5aEH
netwerk/base/nsIBrowserSearchService.idl
xpcom/io/nsAppDirectoryServiceDefs.h
--- a/netwerk/base/nsIBrowserSearchService.idl
+++ b/netwerk/base/nsIBrowserSearchService.idl
@@ -423,18 +423,17 @@ interface nsIBrowserSearchService : nsIS
    * @returns an array of nsISearchEngine objects.
    */
   void getVisibleEngines(
             [optional] out unsigned long engineCount,
             [retval, array, size_is(engineCount)] out nsISearchEngine engines);
 
   /**
    * Returns an array of all default search engines. This includes all loaded
-   * engines that aren't in the user's profile directory
-   * (NS_APP_USER_SEARCH_DIR).
+   * engines that aren't in the user's profile directory.
    *
    * @returns an array of nsISearchEngine objects.
    */
   void getDefaultEngines(
             [optional] out unsigned long engineCount,
             [retval, array, size_is(engineCount)] out nsISearchEngine engines);
 
   /**
--- a/xpcom/io/nsAppDirectoryServiceDefs.h
+++ b/xpcom/io/nsAppDirectoryServiceDefs.h
@@ -59,17 +59,16 @@
 #define NS_APP_PREFS_50_FILE                    "PrefF"
 #define NS_APP_PREFS_DEFAULTS_DIR_LIST          "PrefDL"
 #define NS_APP_PREFS_OVERRIDE_DIR               "PrefDOverride" // Directory for per-profile defaults
 
 #define NS_APP_USER_PROFILE_50_DIR              "ProfD"
 #define NS_APP_USER_PROFILE_LOCAL_50_DIR        "ProfLD"
 
 #define NS_APP_USER_CHROME_DIR                  "UChrm"
-#define NS_APP_USER_SEARCH_DIR                  "UsrSrchPlugns"
 
 #define NS_APP_LOCALSTORE_50_FILE               "LclSt"
 #define NS_APP_USER_PANELS_50_FILE              "UPnls"
 #define NS_APP_CACHE_PARENT_DIR                 "cachePDir"
 
 #define NS_APP_INSTALL_CLEANUP_DIR              "XPIClnupD"  //location of xpicleanup.dat xpicleanup.exe
 
 #define NS_APP_INDEXEDDB_PARENT_DIR             "indexedDBPDir"