From 86371f1eae3fcc3577027fcf79b94cc5e2599ab2 Mon Sep 17 00:00:00 2001
From: Asaf Romano <mano@mozilla.com>
Date: Fri, 22 Jun 2012 23:11:42 +0300
Subject: [PATCH] Bug 738263 - Default bookmarks are still not imported during
 initial migration. r=gavin.

---
 .../migration/src/MigrationUtils.jsm          | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/browser/components/migration/src/MigrationUtils.jsm b/browser/components/migration/src/MigrationUtils.jsm
index 1b3e0fb0155..0669aa88372 100644
--- a/browser/components/migration/src/MigrationUtils.jsm
+++ b/browser/components/migration/src/MigrationUtils.jsm
@@ -266,17 +266,14 @@ let MigratorPrototype = {
                           getService(Ci.nsIObserver);
         browserGlue.observe(null, TOPIC_WILL_IMPORT_BOOKMARKS, "");
 
-        let bookmarksHTMLFile = Services.dirsvc.get("BMarks", Ci.nsIFile);
-        if (bookmarksHTMLFile.exists()) {
-          // Note doMigrate doesn't care about the success value of the
-          // callback.
-          BookmarkHTMLUtils.importFromURL(
-            NetUtil.newURI(bookmarksHTMLFile).spec, true, function(a) {
-              browserGlue.observe(null, TOPIC_DID_IMPORT_BOOKMARKS, "");
-              doMigrate();
-            });
-          return;
-        }
+        // Note doMigrate doesn't care about the success value of the
+        // callback.
+        BookmarkHTMLUtils.importFromURL(
+          "resource:///defaults/profile/bookmarks.html", true, function(a) {
+            browserGlue.observe(null, TOPIC_DID_IMPORT_BOOKMARKS, "");
+            doMigrate();
+          });
+        return;
       }
     }
     doMigrate();