Backed out changeset e9f64cd044f3 (bug 526601)
authorShawn Wilsher <sdwilsh@shawnwilsher.com>
Tue, 01 Dec 2009 15:04:24 -0800
changeset 35405 8e986811ab388f741166aa7b34e2caa0f8088cd4
parent 35398 e9f64cd044f3af6a40f6fac1f4d377890b92badc
child 35406 f92a0d704ec3e2a32d64bf307cd715b01876c4ca
push id10569
push usersdwilsh@shawnwilsher.com
push dateTue, 01 Dec 2009 23:07:52 +0000
treeherdermozilla-central@a5e1b195ecf7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs526601
milestone1.9.3a1pre
backs oute9f64cd044f3af6a40f6fac1f4d377890b92badc
Backed out changeset e9f64cd044f3 (bug 526601)
toolkit/components/places/src/nsPlacesDBFlush.js
toolkit/components/places/tests/sync/test_database_sync_after_shutdown_with_removeAllPages.js
--- a/toolkit/components/places/src/nsPlacesDBFlush.js
+++ b/toolkit/components/places/src/nsPlacesDBFlush.js
@@ -174,17 +174,17 @@ nsPlacesDBFlush.prototype = {
         _self: this,
         run: function() {
           // Flush any remaining change to disk tables.
           this._self._flushWithQueries([kQuerySyncPlacesId, kQuerySyncHistoryVisitsId]);
 
           // Close the database connection, this was the last sync and we can't
           // ensure database coherence from now on.
           this._self._finalizeInternalStatements();
-          this._self._db.asyncClose();
+          this._self._db.close();
         }
       }, Ci.nsIThread.DISPATCH_NORMAL);
     }
     else if (aTopic == "nsPref:changed" && aData == kSyncPrefName) {
       // Get the new pref value, and then update our timer
       this._syncInterval = this._prefs.getIntPref(kSyncPrefName);
       if (this._syncInterval <= 0)
         this._syncInterval = kDefaultSyncInterval;
--- a/toolkit/components/places/tests/sync/test_database_sync_after_shutdown_with_removeAllPages.js
+++ b/toolkit/components/places/tests/sync/test_database_sync_after_shutdown_with_removeAllPages.js
@@ -134,21 +134,20 @@ function check_results() {
     stmt.finalize();
 
     // Check that all visit_counts have been brought to 0
     stmt = DBConn().createStatement(
       "SELECT id FROM moz_places WHERE visit_count <> 0 LIMIT 1");
     do_check_false(stmt.executeStep());
     stmt.finalize();
 
-    dbConn.asyncClose(function() {
-      do_check_false(dbConn.connectionReady);
+    dbConn.close();
+    do_check_false(dbConn.connectionReady);
 
-      do_test_finished();
-    });
+    do_test_finished();
 }
 
 function run_test()
 {
   do_test_pending();
 
   // Set the preference for the timer to a really large value, so it won't
   // run before the test finishes.