Bug 1081297 - Disable UnifiedComplete for Firefox 35. r=ttaubert, a=lsblakk
authorMarco Bonardo <mbonardo@mozilla.com>
Thu, 16 Oct 2014 13:18:00 -0400
changeset 223522 0f206c761e1c67f011ec3cb675e796507e6d58a9
parent 223521 f84bc950b7b9fc34ca02856cdf9fbf99ad058146
child 223523 16313092de82b9a93476ab8f0ec79358c17f9ada
push id5
push usergszorc@mozilla.com
push dateWed, 29 Oct 2014 02:51:31 +0000
reviewersttaubert, lsblakk
bugs1081297
milestone35.0a2
Bug 1081297 - Disable UnifiedComplete for Firefox 35. r=ttaubert, a=lsblakk
browser/app/profile/firefox.js
browser/base/content/test/general/browser_bug1024133-switchtab-override-keynav.js
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -309,18 +309,18 @@ pref("browser.urlbar.doubleClickSelectsA
 #else
 pref("browser.urlbar.doubleClickSelectsAll", false);
 #endif
 
 // Control autoFill behavior
 pref("browser.urlbar.autoFill", true);
 pref("browser.urlbar.autoFill.typed", true);
 
-// Use the new unifiedComplete component
-pref("browser.urlbar.unifiedcomplete", true);
+// Whether to use the new unifiedComplete component
+pref("browser.urlbar.unifiedcomplete", false);
 
 // 0: Match anywhere (e.g., middle of words)
 // 1: Match on word boundaries and then try matching anywhere
 // 2: Match only on word boundaries (e.g., after / or .)
 // 3: Match at the beginning of the url or title
 pref("browser.urlbar.matchBehavior", 1);
 pref("browser.urlbar.filter.javascript", true);
 
--- a/browser/base/content/test/general/browser_bug1024133-switchtab-override-keynav.js
+++ b/browser/base/content/test/general/browser_bug1024133-switchtab-override-keynav.js
@@ -1,13 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 add_task(function* test_switchtab_override_keynav() {
+  // This test is only relevant if UnifiedComplete is enabled.
+  if (!Services.prefs.getBoolPref("browser.urlbar.unifiedcomplete"))
+    return;
+
   let testURL = "http://example.org/browser/browser/base/content/test/general/dummy_page.html";
 
   info("Opening first tab");
   let tab = gBrowser.addTab(testURL);
   let tabLoadDeferred = Promise.defer();
   whenTabLoaded(tab, tabLoadDeferred.resolve);
   yield tabLoadDeferred.promise;