Bug 419315 ? All bookmarks lost after using "Restore all user preferences" (r=mano)

browser/app/profile/firefox.js

@@ -631,12 +631,6 @@ pref("browser.sessionstore.max_tab_back_history", 10);
 // allow META refresh by default
 pref("accessibility.blockautorefresh", false);
 
-// import bookmarks.html into Places bookmarks
-pref("browser.places.importBookmarksHTML", true);
-
-// if false, will add the "Smart Bookmarks" folder to the personal toolbar
-pref("browser.places.createdSmartBookmarks", false);
-
 // If true, will migrate uri post-data annotations to
 // bookmark post-data annotations (bug 398914)
 // XXX to be removed after beta 2 (bug 391419)

browser/components/nsBrowserGlue.js

@@ -343,6 +343,14 @@ BrowserGlue.prototype = {
       importBookmarks = prefBranch.getBoolPref("browser.places.importBookmarksHTML");
     } catch(ex) {}
 
+    /**
+     * These prefs are set by the backend services upon creation (or recreation)
+     * of the Places db:
+     * - browser.places.importBookmarksHTML
+     *   Set to false by the history service to indicate we need to re-import.
+     * - browser.places.createdSmartBookmarks
+     *   Set during HTML import to indicate that the queries were created.
+     */
     if (!importBookmarks) {
       // Call it here for Fx3 profiles created before the Places folder
       // has been added, otherwise it's called during import.
@@ -350,6 +358,9 @@ BrowserGlue.prototype = {
       return;
     }
 
+    // ensurePlacesDefaultQueriesInitialized() is called by import.
+    prefBranch.setBoolPref("browser.places.createdSmartBookmarks", false);
+
     var dirService = Cc["@mozilla.org/file/directory_service;1"].
                      getService(Ci.nsIProperties);