mozilla-central: changeset 223073:bfab295de6328219709e34060bf41c2c5af6916c

author	Monica Chew <mmc@mozilla.com>
	Fri, 09 Jan 2015 13:25:24 -0800
changeset 223073	bfab295de6328219709e34060bf41c2c5af6916c
parent 223072	671ad56e6e12927323e4d89d0076e7c04f58b55c
child 223074	115690326c5eb417d374f0b0978657662b79a0fd
push id	28082
push user	cbook@mozilla.com
push date	Mon, 12 Jan 2015 10:44:52 +0000
treeherder	mozilla-central@643589c3ef94 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	gcp
bugs	1109039, 400731
milestone	37.0a1
first release with	nightly linux32 643589c3ef94 / 37.0a1 / 20150112030201 / files nightly linux64 643589c3ef94 / 37.0a1 / 20150112030201 / files nightly mac 643589c3ef94 / 37.0a1 / 20150112030201 / files nightly win32 643589c3ef94 / 37.0a1 / 20150112030201 / files nightly win64 643589c3ef94 / 37.0a1 / 20150112030201 / files
last release without	nightly linux32 b3f84cf78dc2 / 37.0a1 / 20150109030224 / files nightly linux64 b3f84cf78dc2 / 37.0a1 / 20150109030224 / files nightly mac b3f84cf78dc2 / 37.0a1 / 20150109030224 / files nightly win32 b3f84cf78dc2 / 37.0a1 / 20150109030224 / files nightly win64 b3f84cf78dc2 / 37.0a1 / 20150109030224 / files

--- a/browser/components/safebrowsing/content/test/browser.ini
+++ b/browser/components/safebrowsing/content/test/browser.ini
@@ -1,11 +1,11 @@
 [DEFAULT]
 support-files = head.js
 
 [browser_bug400731.js]
-skip-if = e10s
+skip-if = (os == "win") || e10s
 [browser_bug415846.js]
 skip-if = true
 # Disabled because it seems to now touch network resources
 # skip-if = os == "mac"
 # Disabled on Mac because of its bizarre special-and-unique
 # snowflake of a help menu.