Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-03 02:25:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 887876 - Use Sqlite.jsm in browser/components/migration. r=mak

Browse Source
This commit is contained in:
George Veneel Dogga 2017-01-20 04:35:00 -05:00
parent 82d4c11201
commit 809e98f68a
2 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
browser/components/migration/tests/unit/head_migration.js
View File

@ -20,7 +20,8 @@ Cu.import("resource://testing-common/PlacesTestUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "FileUtils",
"resource://gre/modules/FileUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "Sqlite",
"resource://gre/modules/Sqlite.jsm");
// Initialize profile.
var gProfD = do_get_profile();

35
browser/components/migration/tests/unit/test_Chrome_passwords.js
View File

@ -80,31 +80,12 @@ var crypto = new OSCrypto();
var dbConn;
function promiseSetPassword(login) {
return new Promise((resolve, reject) => {
let stmt = dbConn.createAsyncStatement(`
UPDATE logins
SET password_value = :password_value
WHERE rowid = :rowid
`);
let passwordValue = crypto.stringToArray(crypto.encryptData(login.password));
stmt.bindBlobByName("password_value", passwordValue, passwordValue.length);
stmt.params.rowid = login.id;
stmt.executeAsync({
handleError(aError) {
reject("Error with the query: " + aError.message);
},
handleCompletion(aReason) {
if (aReason === Ci.mozIStorageStatementCallback.REASON_FINISHED) {
resolve();
} else {
reject("Query has failed: " + aReason);
}
},
});
stmt.finalize();
});
let passwordValue = crypto.stringToArray(crypto.encryptData(login.password));
return dbConn.execute(`UPDATE logins
SET password_value = :password_value
WHERE rowid = :rowid
`, { password_value: passwordValue,
rowid: login.id });
}
function checkLoginsAreEqual(passwordManagerLogin, chromeLogin, id) {
@ -147,13 +128,13 @@ function generateDifferentLogin(login) {
add_task(function* setup() {
let loginDataFile = do_get_file("AppData/Local/Google/Chrome/User Data/Default/Login Data");
dbConn = Services.storage.openUnsharedDatabase(loginDataFile);
dbConn = yield Sqlite.openConnection({ path: loginDataFile.path });
registerFakePath("LocalAppData", do_get_file("AppData/Local/"));
do_register_cleanup(() => {
Services.logins.removeAllLogins();
dbConn.asyncClose();
crypto.finalize();
return dbConn.close();
});
});