Backed out changeset e29ea34afb6c (bug 966692) for failures in browser_webconsole_dont_navigate_on_doubleclick.js
authorEd Morley <emorley@mozilla.com>
Tue, 25 Feb 2014 17:01:42 +0000
changeset 170888 9e154b6934627348e724f58ae7b7c6eb9b7ae9b4
parent 170887 44f836fecd71b516ba3221ac8d5627a0e4e17f06
child 170889 6fa0c7a9f778bacc2bfd722b7b5f86381e1d1ce5
push id270
push userpvanderbeken@mozilla.com
push dateThu, 06 Mar 2014 09:24:21 +0000
bugs966692
milestone30.0a1
backs oute29ea34afb6c41062f3201ac82a2199d5dd5d214
Backed out changeset e29ea34afb6c (bug 966692) for failures in browser_webconsole_dont_navigate_on_doubleclick.js
browser/app/profile/firefox.js
browser/devtools/webconsole/test/browser_bug_638949_copy_link_location.js
browser/devtools/webconsole/test/browser_webconsole_bug_632817.js
browser/devtools/webconsole/test/browser_webconsole_bug_764572_output_open_url.js
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1198,23 +1198,23 @@ pref("devtools.theme", "dark");
 // Display the introductory text
 pref("devtools.gcli.hideIntro", false);
 
 // How eager are we to show help: never=1, sometimes=2, always=3
 pref("devtools.gcli.eagerHelper", 2);
 
 // Remember the Web Console filters
 pref("devtools.webconsole.filter.network", true);
-pref("devtools.webconsole.filter.networkinfo", false);
+pref("devtools.webconsole.filter.networkinfo", true);
 pref("devtools.webconsole.filter.netwarn", true);
 pref("devtools.webconsole.filter.csserror", true);
 pref("devtools.webconsole.filter.cssparser", false);
 pref("devtools.webconsole.filter.csslog", false);
 pref("devtools.webconsole.filter.exception", true);
-pref("devtools.webconsole.filter.jswarn", false);
+pref("devtools.webconsole.filter.jswarn", true);
 pref("devtools.webconsole.filter.jslog", true);
 pref("devtools.webconsole.filter.error", true);
 pref("devtools.webconsole.filter.warn", true);
 pref("devtools.webconsole.filter.info", true);
 pref("devtools.webconsole.filter.log", true);
 pref("devtools.webconsole.filter.secerror", true);
 pref("devtools.webconsole.filter.secwarn", true);
 
--- a/browser/devtools/webconsole/test/browser_bug_638949_copy_link_location.js
+++ b/browser/devtools/webconsole/test/browser_bug_638949_copy_link_location.js
@@ -8,24 +8,20 @@ const TEST_URI = "http://example.com/bro
 const COMMAND_NAME = "consoleCmd_copyURL";
 const CONTEXT_MENU_ID = "#menu_copyURL";
 
 let HUD = null;
 let output = null;
 let menu = null;
 
 function test() {
-  let originalNetPref = Services.prefs.getBoolPref("devtools.webconsole.filter.networkinfo");
   registerCleanupFunction(() => {
-    Services.prefs.setBoolPref("devtools.webconsole.filter.networkinfo", originalNetPref);
     HUD = output = menu = null;
   });
 
-  Services.prefs.setBoolPref("devtools.webconsole.filter.networkinfo", true);
-
   addTab(TEST_URI);
   browser.addEventListener("load", function onLoad() {
     browser.removeEventListener("load", onLoad, true);
 
     openConsole(null, function (aHud) {
       HUD = aHud;
       output = aHud.outputNode;
       menu = HUD.iframeWindow.document.getElementById("output-contextmenu");
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_632817.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_632817.js
@@ -12,23 +12,18 @@ const TEST_DATA_JSON_CONTENT =
   '{ id: "test JSON data", myArray: [ "foo", "bar", "baz", "biff" ] }';
 
 let lastRequest = null;
 let requestCallback = null;
 
 function test()
 {
   const PREF = "devtools.webconsole.persistlog";
-  let original = Services.prefs.getBoolPref("devtools.webconsole.filter.networkinfo");
-  Services.prefs.setBoolPref("devtools.webconsole.filter.networkinfo", true);
   Services.prefs.setBoolPref(PREF, true);
-  registerCleanupFunction(() => {
-    Services.prefs.setBoolPref("devtools.webconsole.filter.networkinfo", original);
-    Services.prefs.clearUserPref(PREF);
-  });
+  registerCleanupFunction(() => Services.prefs.clearUserPref(PREF));
 
   addTab("data:text/html;charset=utf-8,Web Console network logging tests");
 
   browser.addEventListener("load", function onLoad() {
     browser.removeEventListener("load", onLoad, true);
 
     openConsole(null, function(aHud) {
       hud = aHud;
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_764572_output_open_url.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_764572_output_open_url.js
@@ -6,21 +6,16 @@
 // that is shown for network requests
 const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test/test-console.html"
 const COMMAND_NAME = "consoleCmd_openURL";
 const CONTEXT_MENU_ID = "#menu_openURL";
 
 let HUD = null, outputNode = null, contextMenu = null;
 
 function test() {
-  let original = Services.prefs.getBoolPref("devtools.webconsole.filter.networkinfo");
-  Services.prefs.setBoolPref("devtools.webconsole.filter.networkinfo", true);
-  registerCleanupFunction(() => {
-    Services.prefs.setBoolPref("devtools.webconsole.filter.networkinfo", original);
-  });
   addTab(TEST_URI);
   browser.addEventListener("load", function onLoad() {
     browser.removeEventListener("load", onLoad, true);
     openConsole(null, consoleOpened);
   }, true);
 }
 
 function consoleOpened(aHud) {