Bug 518608 - Download Manager Storage usage changes: Don't create statement wrapper & don't use step(). r=sdwilsh

--HG--
extra : rebase_source : 201aab379506521c18620782ea79a7f9cd0e1597

toolkit/components/downloads/test/unit/test_removeDownloadsByTimeframe.js

@@ -105,7 +105,7 @@ function check_existance(aIDs, aExpected)
   let checkFunc = aExpected ? do_check_true : do_check_false;
   for (let i = 0; i < aIDs.length; i++) {
     stmt.params.id = aIDs[i];
-    checkFunc(stmt.step());
+    checkFunc(stmt.executeStep());
     stmt.reset();
   }
 }

toolkit/mozapps/downloads/tests/chrome/test_backspace_key_removes.xul

@@ -127,21 +127,18 @@ function test()
 
   // First, we populate the database with some fake data
   db.executeSimpleSQL("DELETE FROM moz_downloads");
-  var rawStmt = db.createStatement(
+  var stmt = db.createStatement(
     "INSERT INTO moz_downloads (name, source, target, startTime, endTime, " +
       "state, currBytes, maxBytes, preferredAction, autoResume) " +
     "VALUES (:name, :source, :target, :startTime, :endTime, :state, " +
       ":currBytes, :maxBytes, :preferredAction, :autoResume)");
-  var stmt = Cc["@mozilla.org/storage/statement-wrapper;1"].
-             createInstance(Ci.mozIStorageStatementWrapper)
-  stmt.initialize(rawStmt);
   for each (var dl in DownloadData) {
     for (var prop in dl)
       stmt.params[prop] = dl[prop];
 
     stmt.execute();
   }
-  stmt.statement.finalize();
+  stmt.finalize();
 
   // See if the DM is already open, and if it is, close it!
   var wm = Cc["@mozilla.org/appshell/window-mediator;1"].

toolkit/mozapps/downloads/tests/chrome/test_basic_functionality.xul

@@ -193,21 +193,18 @@ function test()
 
   // First, we populate the database with some fake data
   db.executeSimpleSQL("DELETE FROM moz_downloads");
-  var rawStmt = db.createStatement(
+  var stmt = db.createStatement(
     "INSERT INTO moz_downloads (name, source, target, startTime, endTime, " +
       "state, currBytes, maxBytes, preferredAction, autoResume) " +
     "VALUES (:name, :source, :target, :startTime, :endTime, :state, " +
       ":currBytes, :maxBytes, :preferredAction, :autoResume)");
-  var stmt = Cc["@mozilla.org/storage/statement-wrapper;1"].
-             createInstance(Ci.mozIStorageStatementWrapper)
-  stmt.initialize(rawStmt);
   for each (var dl in DownloadData) {
     for (var prop in dl)
       stmt.params[prop] = dl[prop];
 
     stmt.execute();
   }
-  stmt.statement.finalize();
+  stmt.finalize();
 
   // See if the DM is already open, and if it is, close it!
   var wm = Cc["@mozilla.org/appshell/window-mediator;1"].

toolkit/mozapps/downloads/tests/chrome/test_bug_429247.xul

@@ -92,19 +92,16 @@ function test()
   // Empty any old downloads
   db.executeSimpleSQL("DELETE FROM moz_downloads");
 
-  let rawStmt = db.createStatement(
+  let stmt = db.createStatement(
     "INSERT INTO moz_downloads (name, source, target, startTime, endTime, " +
       "state, currBytes, maxBytes, preferredAction, autoResume) " +
     "VALUES (:name, :source, :target, :startTime, :endTime, :state, " +
       ":currBytes, :maxBytes, :preferredAction, :autoResume)");
-  let stmt = Cc["@mozilla.org/storage/statement-wrapper;1"].
-             createInstance(Ci.mozIStorageStatementWrapper)
-  stmt.initialize(rawStmt);
   for (let prop in DownloadData)
     stmt.params[prop] = DownloadData[prop];
 
   stmt.execute();
-  stmt.statement.finalize();
+  stmt.finalize();
 
   // Close the UI if necessary
   let wm = Cc["@mozilla.org/appshell/window-mediator;1"].

toolkit/mozapps/downloads/tests/chrome/test_delete_key_removes.xul

@@ -132,21 +132,18 @@ function test()
 
   // First, we populate the database with some fake data
   db.executeSimpleSQL("DELETE FROM moz_downloads");
-  var rawStmt = db.createStatement(
+  var stmt = db.createStatement(
     "INSERT INTO moz_downloads (name, source, target, startTime, endTime, " +
       "state, currBytes, maxBytes, preferredAction, autoResume) " +
     "VALUES (:name, :source, :target, :startTime, :endTime, :state, " +
       ":currBytes, :maxBytes, :preferredAction, :autoResume)");
-  var stmt = Cc["@mozilla.org/storage/statement-wrapper;1"].
-             createInstance(Ci.mozIStorageStatementWrapper)
-  stmt.initialize(rawStmt);
   for each (var dl in DownloadData) {
     for (var prop in dl)
       stmt.params[prop] = dl[prop];
 
     stmt.execute();
   }
-  stmt.statement.finalize();
+  stmt.finalize();
 
   // See if the DM is already open, and if it is, close it!
   var wm = Cc["@mozilla.org/appshell/window-mediator;1"].

toolkit/mozapps/downloads/tests/chrome/test_pause_button_state.xul

@@ -97,21 +97,18 @@ function test()
 
   // First, we populate the database with some fake data
   db.executeSimpleSQL("DELETE FROM moz_downloads");
-  var rawStmt = db.createStatement(
+  var stmt = db.createStatement(
     "INSERT INTO moz_downloads (name, source, target, startTime, endTime, " +
       "state, currBytes, maxBytes, preferredAction, autoResume, entityID) " +
     "VALUES (:name, :source, :target, :startTime, :endTime, :state, " +
       ":currBytes, :maxBytes, :preferredAction, :autoResume, :entityID)");
-  var stmt = Cc["@mozilla.org/storage/statement-wrapper;1"].
-             createInstance(Ci.mozIStorageStatementWrapper)
-  stmt.initialize(rawStmt);
   for each (var dl in DownloadData) {
     for (var prop in dl)
       stmt.params[prop] = dl[prop];
 
     stmt.execute();
   }
-  stmt.statement.finalize();
+  stmt.finalize();
 
   // See if the DM is already open, and if it is, close it!
   var wm = Cc["@mozilla.org/appshell/window-mediator;1"].

toolkit/mozapps/downloads/tests/chrome/test_removeDownload_updates_ui.xul

@@ -87,21 +87,18 @@ function test()
 
   // First, we populate the database with some fake data
   db.executeSimpleSQL("DELETE FROM moz_downloads");
-  var rawStmt = db.createStatement(
+  var stmt = db.createStatement(
     "INSERT INTO moz_downloads (name, source, target, startTime, endTime, " +
       "state, currBytes, maxBytes, preferredAction, autoResume) " +
     "VALUES (:name, :source, :target, :startTime, :endTime, :state, " +
       ":currBytes, :maxBytes, :preferredAction, :autoResume)");
-  var stmt = Cc["@mozilla.org/storage/statement-wrapper;1"].
-             createInstance(Ci.mozIStorageStatementWrapper)
-  stmt.initialize(rawStmt);
   for each (var dl in DownloadData) {
     for (var prop in dl)
       stmt.params[prop] = dl[prop];
 
     stmt.execute();
   }
-  stmt.statement.finalize();
+  stmt.finalize();
 
   // See if the DM is already open, and if it is, close it!
   var wm = Cc["@mozilla.org/appshell/window-mediator;1"].

toolkit/mozapps/downloads/tests/chrome/utils.js

@@ -127,21 +127,18 @@ function populateDM(DownloadData)
            getService(Ci.nsIDownloadManager);
   let db = dm.DBConnection;
 
-  let rawStmt = db.createStatement(
+  let stmt = db.createStatement(
     "INSERT INTO moz_downloads (name, source, target, startTime, endTime, " +
       "state, currBytes, maxBytes, preferredAction, autoResume) " +
     "VALUES (:name, :source, :target, :startTime, :endTime, :state, " +
       ":currBytes, :maxBytes, :preferredAction, :autoResume)");
-  let stmt = Cc["@mozilla.org/storage/statement-wrapper;1"].
-             createInstance(Ci.mozIStorageStatementWrapper)
-  stmt.initialize(rawStmt);
   for each (let dl in DownloadData) {
     for (let prop in dl)
       stmt.params[prop] = dl[prop];
 
     stmt.execute();
   }
-  stmt.statement.finalize();
+  stmt.finalize();
 }
 
 /**