Bug 1311345 - Enable eslint of browser/components/privatebrowsing/ - Final manual fixes. r?jaws
MozReview-Commit-ID: 66ds8Adnsta
--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_about.js
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_about.js
@@ -13,33 +13,33 @@ function* openAboutPrivateBrowsing() {
return { win, tab };
}
/**
* Clicks the given link and checks this opens a new tab with the given URI.
*/
function* testLinkOpensTab({ win, tab, elementId, expectedUrl }) {
let newTabPromise = BrowserTestUtils.waitForNewTab(win.gBrowser, expectedUrl);
- yield ContentTask.spawn(tab, { elementId }, function* ({ elementId }) {
- content.document.getElementById(elementId).click();
+ yield ContentTask.spawn(tab, elementId, function* (elemId) {
+ content.document.getElementById(elemId).click();
});
let newTab = yield newTabPromise;
ok(true, `Clicking ${elementId} opened ${expectedUrl} in a new tab.`);
yield BrowserTestUtils.removeTab(newTab);
}
/**
* Clicks the given link and checks this opens the given URI in the same tab.
*
* This function does not return to the previous page.
*/
function* testLinkOpensUrl({ win, tab, elementId, expectedUrl }) {
let loadedPromise = BrowserTestUtils.browserLoaded(tab);
- yield ContentTask.spawn(tab, { elementId }, function* ({ elementId }) {
- content.document.getElementById(elementId).click();
+ yield ContentTask.spawn(tab, elementId, function* (elemId) {
+ content.document.getElementById(elemId).click();
});
yield loadedPromise;
is(tab.currentURI.spec, expectedUrl,
`Clicking ${elementId} opened ${expectedUrl} in the same tab.`);
}
/**
* Tests the links in "about:privatebrowsing".--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_cache.js
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_cache.js
@@ -17,17 +17,17 @@ Cc["@mozilla.org/moz/jssubscript-loader;
var Sanitizer = tmp.Sanitizer;
function test() {
waitForExplicitFinish();
sanitizeCache();
- let nrEntriesR1 = getStorageEntryCount("regular", function(nrEntriesR1) {
+ getStorageEntryCount("regular", function(nrEntriesR1) {
is(nrEntriesR1, 0, "Disk cache reports 0KB and has no entries");
get_cache_for_private_window();
});
}
function cleanup() {
let prefs = Services.prefs.getBranch("privacy.cpd.");--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_concurrent_page.html
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_concurrent_page.html
@@ -7,27 +7,27 @@
for (var aItKey, nKeyId = 0, aCouples = window.location.search.substr(1).split("&");
nKeyId < aCouples.length;
nKeyId++) {
aItKey = aCouples[nKeyId].split("=");
oGetVars[unescape(aItKey[0])] = aItKey.length > 1 ? unescape(aItKey[1]) : "";
}
}
- if (oGetVars.initial == 'true') {
+ if (oGetVars.initial == "true") {
localStorage.clear();
}
- if (oGetVars.action == 'set') {
+ if (oGetVars.action == "set") {
localStorage.setItem(oGetVars.name, oGetVars.value);
document.title = localStorage.getItem(oGetVars.name) + "|" + localStorage.length;
- } else if (oGetVars.action == 'get') {
+ } else if (oGetVars.action == "get") {
document.title = localStorage.getItem(oGetVars.name) + "|" + localStorage.length;
}
- if (oGetVars.final == 'true') {
+ if (oGetVars.final == "true") {
localStorage.clear();
}
</script>
</head>
<body>
</body>
</html>--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_context_and_chromeFlags.js
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_context_and_chromeFlags.js
@@ -25,18 +25,18 @@ function assertWindowIsPrivate(win) {
"Should have the private window chrome flag");
}
let loadContext = winDocShell.QueryInterface(Ci.nsILoadContext);
Assert.ok(loadContext.usePrivateBrowsing,
"The parent window should be using private browsing");
return ContentTask.spawn(win.gBrowser.selectedBrowser, null, function*() {
- let loadContext = docShell.QueryInterface(Ci.nsILoadContext);
- Assert.ok(loadContext.usePrivateBrowsing,
+ let contentLoadContext = docShell.QueryInterface(Ci.nsILoadContext);
+ Assert.ok(contentLoadContext.usePrivateBrowsing,
"Content docShell should be using private browsing");
});
}
/**
* Tests that chromeFlags bits and the nsILoadContext.usePrivateBrowsing
* attribute are properly set when opening a new private browsing
* window.--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_downloadLastDir.js
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_downloadLastDir.js
@@ -76,18 +76,18 @@ function test() {
aCallback();
};
launcherDialog.promptForSaveToFileAsync(launcher, aWin, null, null, null);
}
testOnWindow(false, function(win, downloadDir) {
testDownloadDir(win, downloadDir, file1, tmpDir, dir1, dir1, function() {
- testOnWindow(true, function(win, downloadDir) {
- testDownloadDir(win, downloadDir, file2, dir1, dir1, dir2, function() {
- testOnWindow(false, function(win, downloadDir) {
- testDownloadDir(win, downloadDir, file3, dir1, dir3, dir3, finish);
+ testOnWindow(true, function(win1, downloadDir1) {
+ testDownloadDir(win1, downloadDir1, file2, dir1, dir1, dir2, function() {
+ testOnWindow(false, function(win2, downloadDir2) {
+ testDownloadDir(win2, downloadDir2, file3, dir1, dir3, dir3, finish);
});
});
});
});
});
}--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_downloadLastDir_c.js
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_downloadLastDir_c.js
@@ -78,18 +78,18 @@ function test() {
gDownloadLastDir.cleanupPrivateFile();
aWin.close();
aCallback();
}).then(null, function() { ok(false); });
}
testOnWindow(false, function(win, downloadDir) {
testDownloadDir(win, downloadDir, file1, tmpDir, dir1, dir1, function() {
- testOnWindow(true, function(win, downloadDir) {
- testDownloadDir(win, downloadDir, file2, dir1, dir1, dir2, function() {
- testOnWindow(false, function(win, downloadDir) {
- testDownloadDir(win, downloadDir, file3, dir1, dir3, dir3, finish);
+ testOnWindow(true, function(win1, downloadDir1) {
+ testDownloadDir(win1, downloadDir1, file2, dir1, dir1, dir2, function() {
+ testOnWindow(false, function(win2, downloadDir2) {
+ testDownloadDir(win2, downloadDir2, file3, dir1, dir3, dir3, finish);
});
});
});
});
});
}--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_geoprompt.js
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_geoprompt.js
@@ -14,17 +14,17 @@ add_task(function* test() {
aWindow.gBrowser.selectedTab = aWindow.gBrowser.addTab(testPageURL);
yield BrowserTestUtils.browserLoaded(aWindow.gBrowser.selectedBrowser);
let notification = aWindow.PopupNotifications.getNotification("geolocation");
// Wait until the notification is available.
while (!notification) {
yield new Promise(resolve => { executeSoon(resolve); });
- let notification = aWindow.PopupNotifications.getNotification("geolocation");
+ notification = aWindow.PopupNotifications.getNotification("geolocation");
}
if (aPrivateMode) {
// Make sure the notification is correctly displayed without a remember control
ok(!notification.options.checkbox.show, "Secondary actions should exist (always/never remember)");
} else {
ok(notification.options.checkbox.show, "Secondary actions should exist (always/never remember)");
}--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_geoprompt_page.html
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_geoprompt_page.html
@@ -1,13 +1,13 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
<html>
<head>
<title>Geolocation invoker</title>
</head>
<body>
<script type="text/javascript">
- navigator.geolocation.getCurrentPosition(function (pos) {
+ navigator.geolocation.getCurrentPosition(function(pos) {
// ignore
});
</script>
</body>
</html>--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_localStorage.js
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_localStorage.js
@@ -4,17 +4,17 @@
add_task(function* test() {
requestLongerTimeout(2);
const page1 = "http://mochi.test:8888/browser/browser/components/privatebrowsing/test/browser/" +
"browser_privatebrowsing_localStorage_page1.html"
let win = yield BrowserTestUtils.openNewBrowserWindow({private: true});
- let tab = win.gBrowser.selectedTab = win.gBrowser.addTab(page1);
+ win.gBrowser.selectedTab = win.gBrowser.addTab(page1);
let browser = win.gBrowser.selectedBrowser;
yield BrowserTestUtils.browserLoaded(browser);
browser.loadURI(
"http://mochi.test:8888/browser/browser/components/privatebrowsing/test/browser/" +
"browser_privatebrowsing_localStorage_page2.html");
yield BrowserTestUtils.browserLoaded(browser);
--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_localStorage_before_after.js
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_localStorage_before_after.js
@@ -6,17 +6,16 @@
// allow any data to leak due to cached values.
// Step 1: Load browser_privatebrowsing_localStorage_before_after_page.html in a private tab, causing a storage
// item to exist. Close the tab.
// Step 2: Load the same page in a non-private tab, ensuring that the storage instance reports only one item
// existing.
add_task(function* test() {
- let testURI = "about:blank";
let prefix = "http://mochi.test:8888/browser/browser/components/privatebrowsing/test/browser/";
// Step 1.
let privateWin = yield BrowserTestUtils.openNewBrowserWindow({private: true});
let privateBrowser = privateWin.gBrowser.addTab(
prefix + "browser_privatebrowsing_localStorage_before_after_page.html").linkedBrowser;
yield BrowserTestUtils.browserLoaded(privateBrowser);
--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_localStorage_before_after_page.html
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_localStorage_before_after_page.html
@@ -1,11 +1,11 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<script type="text/javascript">
localStorage.clear();
- localStorage.setItem('zzztest', 'zzzvalue');
+ localStorage.setItem("zzztest", "zzzvalue");
document.title = localStorage.length;
</script>
</head>
<body>
</body>
</html>--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_localStorage_before_after_page2.html
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_localStorage_before_after_page2.html
@@ -1,10 +1,10 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<script type="text/javascript">
- document.title = localStorage.getItem('zzztest', 'zzzvalue') + '|' + localStorage.length;
+ document.title = localStorage.getItem("zzztest", "zzzvalue") + "|" + localStorage.length;
localStorage.clear();
</script>
</head>
<body>
</body>
</html>--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_localStorage_page1.html
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_localStorage_page1.html
@@ -1,10 +1,10 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<script type="text/javascript">
localStorage.clear();
- localStorage.setItem('test1', 'value1');
+ localStorage.setItem("test1", "value1");
</script>
</head>
<body>
</body>
</html>--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_localStorage_page2.html
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_localStorage_page2.html
@@ -1,10 +1,10 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<script type="text/javascript">
- localStorage.setItem('test2', 'value2');
+ localStorage.setItem("test2", "value2");
document.title = localStorage.length;
</script>
</head>
<body>
</body>
</html>