merge mozilla-inbound to mozilla-central a=merge

browser/base/content/test/urlbar/browser.ini

@@ -6,6 +6,7 @@ support-files =
 [browser_URLBarSetURI.js]
 skip-if = (os == "linux" || os == "mac") && debug # bug 970052, bug 970053
 [browser_action_keyword.js]
+skip-if = os == "linux" # Bug 1188154
 [browser_action_keyword_override.js]
 [browser_action_searchengine.js]
 [browser_action_searchengine_alias.js]
@@ -32,7 +33,7 @@ support-files =
 [browser_bug783614.js]
 [browser_canonizeURL.js]
 [browser_locationBarCommand.js]
-skip-if = os == "linux" # Linux: Intermittent failures, bug 917535
+skip-if = true # bug 917535, bug 1289765
 [browser_locationBarExternalLoad.js]
 [browser_moz_action_link.js]
 [browser_removeUnsafeProtocolsFromURLBarPaste.js]

browser/components/uitour/test/browser.ini

@@ -31,6 +31,7 @@ skip-if = os == "linux" # Linux: Bug 986760, Bug 989101.
 [browser_UITour_detach_tab.js]
 [browser_UITour_forceReaderMode.js]
 [browser_UITour_heartbeat.js]
+skip-if = os == "win" # Bug 1277107
 [browser_UITour_modalDialog.js]
 skip-if = os != "mac" # modal dialog disabling only working on OS X.
 [browser_UITour_observe.js]

browser/modules/test/browser.ini

@@ -7,7 +7,7 @@ support-files =
 [browser_BrowserUITelemetry_sidebar.js]
 [browser_BrowserUITelemetry_syncedtabs.js]
 [browser_CaptivePortalWatcher.js]
-skip-if = os == "linux" || os == "win" # Bug 1279491
+skip-if = os == "linux" || os == "win" || (os == "mac" && debug && e10s) # Bug 1279491, Bug 1287714 for OS X debug e10s
 [browser_ProcessHangNotifications.js]
 skip-if = !e10s
 [browser_ContentSearch.js]

layout/generic/test/chrome.ini

@@ -13,5 +13,5 @@ skip-if = true # Bug 1163311
 [test_bug508115.xul]
 [test_bug514732-2.xul]
 [test_bug632379.xul]
-skip-if = buildapp == 'mulet'
+skip-if = buildapp == 'mulet' || os == 'linux' # Bug 1207914 for Linux
 [test_selection_underline.html]

modules/libpref/init/all.js

@@ -5142,7 +5142,7 @@ pref("browser.safebrowsing.reportPhishURL", "https://%LOCALE%.phish-report.mozil
 pref("browser.safebrowsing.reportMalwareMistakeURL", "https://%LOCALE%.malware-error.mozilla.com/?hl=%LOCALE%&url=");
 
 // The table and global pref for blocking plugin content
-pref("browser.safebrowsing.blockedURIs.enabled", false);
+pref("browser.safebrowsing.blockedURIs.enabled", true);
 pref("urlclassifier.blockedTable", "test-block-simple,mozplugin-block-digest256");
 
 // The protocol version we communicate with mozilla server.

toolkit/content/tests/chrome/chrome.ini

@@ -137,6 +137,7 @@ skip-if = os == 'linux' # 1167694
 [test_popup_attribute.xul]
 skip-if = os == 'linux' && asan #Bug 1131634
 [test_popup_button.xul]
+skip-if = os == 'linux' && asan # Bug 1281360
 [test_popup_coords.xul]
 [test_popup_keys.xul]
 [test_popup_moveToAnchor.xul]