Bug 482911 addendum - Tell nsBrowserGlue not to import initial bookmarks in a couple of tests to avoid fatal assertions on Mac. r=mak.

browser/components/places/tests/unit/test_421483.js

@@ -56,6 +56,8 @@ try {
 try {
   var gluesvc = Cc["@mozilla.org/browser/browserglue;1"].
                 getService(Ci.nsIBrowserGlue);
+  // Avoid default bookmarks import.
+  gluesvc.QueryInterface(Ci.nsIObserver).observe(null, "initial-migration", null);
 } catch(ex) {
   do_throw("Could not get BrowserGlue service\n");
 }

browser/components/places/tests/unit/test_clearHistory_shutdown.js

@@ -110,7 +110,9 @@ function run_test() {
   do_test_pending();
 
   print("Initialize browserglue before Places");
-  Cc["@mozilla.org/browser/browserglue;1"].getService(Ci.nsIBrowserGlue);
+  // Avoid default bookmarks import.
+  Cc["@mozilla.org/browser/browserglue;1"].getService(Ci.nsIObserver)
+    .observe(null, "initial-migration", null);
 
   Services.prefs.setBoolPref("privacy.clearOnShutdown.cache", true);
   Services.prefs.setBoolPref("privacy.clearOnShutdown.cookies", true);