mozilla-central: changeset 260644:ff553f6079f458fd43fc59dcbdae2d10879d2725

author	Ehsan Akhgari <ehsan@mozilla.com>
	Wed, 02 Sep 2015 20:29:20 -0400
changeset 260644	ff553f6079f458fd43fc59dcbdae2d10879d2725
parent 260643	8534fa84c4902fe0caad46697c7ef15cb2d19928
child 260645	26951c3aa2671ccdc8e78d21c00c2a0501fd2bb5
push id	29318
push user	cbook@mozilla.com
push date	Thu, 03 Sep 2015 11:15:07 +0000
treeherder	mozilla-central@74fbd245369c [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
bugs	1006240, 906190
milestone	43.0a1
first release with	nightly linux32 7f987c38bd3e / 43.0a1 / 20150904030227 / files nightly linux64 7f987c38bd3e / 43.0a1 / 20150904030227 / files nightly mac 7f987c38bd3e / 43.0a1 / 20150904030227 / files nightly win32 7f987c38bd3e / 43.0a1 / 20150904030227 / files nightly win64 7f987c38bd3e / 43.0a1 / 20150904030227 / files
last release without	nightly linux32 fb720c90eb49 / 43.0a1 / 20150902030229 / files nightly linux64 fb720c90eb49 / 43.0a1 / 20150902030229 / files nightly mac fb720c90eb49 / 43.0a1 / 20150902030229 / files nightly win32 fb720c90eb49 / 43.0a1 / 20150902030229 / files nightly win64 fb720c90eb49 / 43.0a1 / 20150902030229 / files

--- a/browser/base/content/test/general/browser_bug906190.js
+++ b/browser/base/content/test/general/browser_bug906190.js
@@ -65,16 +65,17 @@ let curTestName = null;
 let curChildTabLink = null;
 
 //------------------------ Helper Functions ---------------------
 
 registerCleanupFunction(function() {
   // Set preferences back to their original values
   Services.prefs.setBoolPref(PREF_ACTIVE, origBlockActive);
 });
+requestLongerTimeout(2);
 
 /*
  * Whenever we disable the Mixed Content Blocker of the page
  * we have to make sure that our condition is properly loaded.
  */
 function waitForCondition(condition, nextTest, errorMsg) {
   var tries = 0;
   var interval = setInterval(function() {