Bug 1315042 - Re-enable some tests part2. r=me

browser/base/content/test/general/browser.ini

@@ -256,7 +256,6 @@ skip-if = os == "mac" # mac: Intermittent failures, bug 925225
 skip-if = os == "mac" # Bug 1102331 - does focus things on the content window which break in e10s mode (still causes orange on Mac 10.10)
 [browser_bug710878.js]
 [browser_bug719271.js]
-skip-if = e10s # Bug 1315042
 [browser_bug724239.js]
 [browser_bug734076.js]
 [browser_bug735471.js]
@@ -407,7 +406,6 @@ skip-if = os == "linux" # Bug 1329991 - test fails intermittently on Linux build
 skip-if = os == 'linux' # Bug 1304272
 [browser_tab_close_dependent_window.js]
 [browser_tabDrop.js]
-skip-if = e10s # Bug 1315042
 [browser_tabReorder.js]
 [browser_tab_detach_restore.js]
 [browser_tab_drag_drop_perwindow.js]
@@ -418,9 +416,8 @@ skip-if = buildapp == 'mulet' || (e10s && (debug || asan)) # Bug 1312436
 skip-if = os == "linux" || os == "mac" # No tabs in titlebar on linux
                                        # Disabled on OS X because of bug 967917
 [browser_tabfocus.js]
-skip-if = e10s # Bug 1315042
 [browser_tabkeynavigation.js]
-skip-if = true || (os == "mac" && !e10s) # Bug 1315042, Bug 1237713 - OSX eats keypresses for some reason
+skip-if = (os == "mac" && !e10s) # Bug 1237713 - OSX eats keypresses for some reason
 [browser_tabopen_reflows.js]
 [browser_tabs_close_beforeunload.js]
 support-files =

browser/base/content/test/referrer/browser.ini

@@ -6,9 +6,7 @@ support-files =
   head.js
 
 [browser_referrer_middle_click.js]
-skip-if = true # Bug 1315042
 [browser_referrer_middle_click_in_container.js]
-skip-if = true # Bug 1315042
 [browser_referrer_open_link_in_private.js]
 skip-if = os == 'linux' # Bug 1145199
 [browser_referrer_open_link_in_tab.js]

toolkit/components/passwordmgr/test/browser/browser.ini

@@ -47,7 +47,6 @@ support-files =
 [browser_formless_submit_chrome.js]
 [browser_hasInsecureLoginForms.js]
 [browser_hasInsecureLoginForms_streamConverter.js]
-skip-if = e10s # Bug 1315042
 [browser_http_autofill.js]
 [browser_insecurePasswordConsoleWarning.js]
 support-files =

toolkit/components/passwordmgr/test/browser/browser_hasInsecureLoginForms_streamConverter.js

@@ -83,7 +83,7 @@ add_task(function* test_streamConverter() {
 
   let tab = gBrowser.addTab("http://example.com/browser/toolkit/components/" +
                             "passwordmgr/test/browser/streamConverter_content.sjs",
-                            { relatedBrowser: originalBrowser.linkedBrowser });
+                            { relatedBrowser: originalBrowser });
   let browser = tab.linkedBrowser;
   yield Promise.all([
     BrowserTestUtils.switchTab(gBrowser, tab),