Back out 3c8a737a5f8a (bug 1168658) for frequent Gij(10) failures in homescreen_navigation_test.js and edges_gesture_test.js, a=backout
authorPhil Ringnalda <philringnalda@gmail.com>
Wed, 10 Jun 2015 20:37:27 -0700
changeset 248114 bfd82015df48e7054b7786d3efc9826e1000e3d3
parent 248113 54942e3f878087156d18983dd119af1640e50354
child 248124 92c37112c6ab2c5b4566d657e6bf257c02b216e0
child 248142 72b45f04e025e3b39779459a599feee830a2b2a2
child 248229 2bf42a83d15f0c80e85b75cb3e44f65c5ea9f0a2
push id28890
push userphilringnalda@gmail.com
push dateThu, 11 Jun 2015 03:37:43 +0000
treeherdermozilla-central@bfd82015df48 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1168658
milestone41.0a1
backs out3c8a737a5f8a0f1959daf3450406c572cd392730
first release with
nightly linux32
bfd82015df48 / 41.0a1 / 20150611030208 / files
nightly linux64
bfd82015df48 / 41.0a1 / 20150611030208 / files
nightly mac
bfd82015df48 / 41.0a1 / 20150611030208 / files
nightly win32
bfd82015df48 / 41.0a1 / 20150611030208 / files
nightly win64
bfd82015df48 / 41.0a1 / 20150611030208 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Back out 3c8a737a5f8a (bug 1168658) for frequent Gij(10) failures in homescreen_navigation_test.js and edges_gesture_test.js, a=backout
b2g/app/b2g.js
dom/browser-element/BrowserElementChildPreload.js
--- a/b2g/app/b2g.js
+++ b/b2g/app/b2g.js
@@ -347,20 +347,20 @@ pref("image.onload.decode.limit", 24); /
 // we don't really have a better one at the moment.
 // enable touch events interfaces
 pref("dom.w3c_touch_events.enabled", 1);
 pref("dom.w3c_touch_events.safetyX", 0); // escape borders in units of 1/240"
 pref("dom.w3c_touch_events.safetyY", 120); // escape borders in units of 1/240"
 
 #ifdef MOZ_SAFE_BROWSING
 // Safe browsing does nothing unless this pref is set
-pref("browser.safebrowsing.enabled", true);
+pref("browser.safebrowsing.enabled", false);
 
 // Prevent loading of pages identified as malware
-pref("browser.safebrowsing.malware.enabled", true);
+pref("browser.safebrowsing.malware.enabled", false);
 
 pref("browser.safebrowsing.debug", false);
 pref("browser.safebrowsing.updateURL", "https://safebrowsing.google.com/safebrowsing/downloads?client=SAFEBROWSING_ID&appver=%VERSION%&pver=2.2&key=%GOOGLE_API_KEY%");
 pref("browser.safebrowsing.gethashURL", "https://safebrowsing.google.com/safebrowsing/gethash?client=SAFEBROWSING_ID&appver=%VERSION%&pver=2.2");
 pref("browser.safebrowsing.reportURL", "https://safebrowsing.google.com/safebrowsing/report?");
 pref("browser.safebrowsing.reportGenericURL", "http://%LOCALE%.phish-generic.mozilla.com/?hl=%LOCALE%");
 pref("browser.safebrowsing.reportErrorURL", "http://%LOCALE%.phish-error.mozilla.com/?hl=%LOCALE%");
 pref("browser.safebrowsing.reportPhishURL", "http://%LOCALE%.phish-report.mozilla.com/?hl=%LOCALE%");
@@ -400,21 +400,16 @@ pref("urlclassifier.gethash.timeout_ms",
 
 // If an urlclassifier table has not been updated in this number of seconds,
 // a gethash request will be forced to check that the result is still in
 // the database.
 pref("urlclassifier.max-complete-age", 2700);
 
 // URL for checking the reason for a malware warning.
 pref("browser.safebrowsing.malware.reportURL", "https://safebrowsing.google.com/safebrowsing/diagnostic?client=%NAME%&hl=%LOCALE%&site=");
-
-// Tracking protection
-pref("privacy.trackingprotection.enabled", true);
-pref("privacy.trackingprotection.pbmode.enabled", false);
-
 #endif
 
 // True if this is the first time we are showing about:firstrun
 pref("browser.firstrun.show.uidiscovery", true);
 pref("browser.firstrun.show.localepicker", true);
 
 // initiated by a user
 pref("content.ime.strict_policy", true);
--- a/dom/browser-element/BrowserElementChildPreload.js
+++ b/dom/browser-element/BrowserElementChildPreload.js
@@ -1433,22 +1433,16 @@ BrowserElementChild.prototype = {
         stateDesc = 'secure';
       }
       else if (state & Ci.nsIWebProgressListener.STATE_IS_BROKEN) {
         stateDesc = 'broken';
       }
       else if (state & Ci.nsIWebProgressListener.STATE_IS_INSECURE) {
         stateDesc = 'insecure';
       }
-      else if (state & Ci.nsIWebProgressListener.STATE_LOADED_TRACKING_CONTENT) {
-        stateDesc = 'loaded_tracking_content';
-      }
-      else if (state & Ci.nsIWebProgressListener.STATE_BLOCKED_TRACKING_CONTENT) {
-        stateDesc = 'blocked_tracking_content';
-      }
       else {
         debug("Unexpected securitychange state!");
         stateDesc = '???';
       }
 
       var isEV = !!(state & Ci.nsIWebProgressListener.STATE_IDENTITY_EV_TOPLEVEL);
 
       sendAsyncMsg('securitychange', { state: stateDesc, extendedValidation: isEV });