Bug 919506 - Fix browser.bookmarks.autoExportHTML not working due to bug 910885. r=mak, a=lsblakk
authorMarco Castelluccio <mar.castelluccio@studenti.unina.it>
Wed, 25 Sep 2013 09:37:22 -0400
changeset 223604 9a3d4289913d96b10201f634f7054c441dac91f0
parent 223603 3234e28582d36846cdd312e31d988160afd2b7c0
child 223605 7f60b667c7e1129c4c3f11197b4b4e2ad77fdef5
push id6
push userryanvm@gmail.com
push dateMon, 12 Jan 2015 22:04:06 +0000
treeherdermozilla-b2g37_v2_2@895c8fc7b734 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmak, lsblakk
bugs919506, 910885
milestone26.0a2
Bug 919506 - Fix browser.bookmarks.autoExportHTML not working due to bug 910885. r=mak, a=lsblakk
browser/components/nsBrowserGlue.js
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -1199,17 +1199,17 @@ BrowserGlue.prototype = {
     if (Services.prefs.getBoolPref("browser.bookmarks.autoExportHTML")) {
       // Exceptionally, since this is a non-default setting and HTML format is
       // discouraged in favor of the JSON backups, we spin the event loop on
       // shutdown, to wait for the export to finish.  We cannot safely spin
       // the event loop on shutdown until we include a watchdog to prevent
       // potential hangs (bug 518683).  The asynchronous shutdown operations
       // will then be handled by a shutdown service (bug 435058).
       waitingForHTMLExportToComplete = false;
-      BookmarkHTMLUtils.exportToFile(FileUtils.getFile("BMarks", [])).then(
+      BookmarkHTMLUtils.exportToFile(Services.dirsvc.get("BMarks", Ci.nsIFile)).then(
         function onSuccess() {
           waitingForHTMLExportToComplete = true;
         },
         function onFailure() {
           Cu.reportError("Unable to auto export html.");
           waitingForHTMLExportToComplete = true;
         }
       );