Bug 1177018 - Increase the APZ content response timeout to 15 seconds for all tests. r=kats

It has previously been increased for a specific test, but we have found
another test that needs it increased. Rather than increasing it for
individual tests, increase it for all tests.

--HG--
extra : rebase_source : 1e32b0c851bb138d1ed247fea72312c09380266c
extra : source : fb4d8f6db088a2da12d01403280b959d176fee0a

gfx/layers/apz/test/test_basic_pan.html

@@ -40,14 +40,7 @@ window.onload = function() {
         // Dropping the touch slop to 0 makes the tests easier to write because
         // we can just do a one-pixel drag to get over the pan threshold rather
         // than having to hard-code some larger value.
-        ["apz.touch_start_tolerance", "0.0"],
-
-        // The B2G emulator is hella slow, and needs more than 300ms to run the
-        // main-thread code that deals with layerizing subframes and running
-        // touch listeners. In my local runs this needs to be at least 1000.
-        // On try this sometimes needs to be as long as 8 seconds (bug 1176798)
-        // so we make it 15 seconds just to be extra safe.
-        ["apz.content_response_timeout", "15000"]
+        ["apz.touch_start_tolerance", "0.0"]
       ]
     }, testDone);
 };

testing/profiles/prefs_general.js

@@ -252,6 +252,13 @@ user_pref("identity.fxaccounts.remote.signin.uri", "https://%(server)s/fxa-signi
 user_pref("identity.fxaccounts.settings.uri", "https://%(server)s/fxa-settings");
 user_pref('identity.fxaccounts.remote.webchannel.uri', 'https://%(server)s/');
 
+// Increase the APZ content response timeout in tests to 15 seconds.
+// This is to accommodate the fact that test environments tends to be slower
+// than production environments (with the b2g emulator being the slowest of them
+// all), resulting in the production timeout value sometimes being exceeded
+// and causing false-positive test failures. See bug 1176798, bug 1177018.
+user_pref("apz.content_response_timeout", 15000);
+
 // Make sure SSL Error reports don't hit the network
 user_pref("security.ssl.errorReporting.url", "https://example.com/browser/browser/base/content/test/general/pinning_reports.sjs?succeed");