From a3ef995872cd1dcf6f903512cbdb7a7166337e9f Mon Sep 17 00:00:00 2001
From: "Carsten \"Tomcat\" Book" <cbook@mozilla.com>
Date: Fri, 11 Sep 2015 16:24:28 +0200
Subject: [PATCH] Backed out 1 changesets (bug 1184220) for test failures in
 browser_searchbar_keyboard_navigation.js

Backed out changeset c3f13feea4cd (bug 1184220)
---
 browser/components/search/content/search.xml    |  4 ----
 .../browser_searchbar_keyboard_navigation.js    | 17 -----------------
 2 files changed, 21 deletions(-)

diff --git a/browser/components/search/content/search.xml b/browser/components/search/content/search.xml
index 8ee47044a836..3be48078ff1d 100644
--- a/browser/components/search/content/search.xml
+++ b/browser/components/search/content/search.xml
@@ -1143,10 +1143,6 @@
           let isOneOffSelected =
             this.selectedButton &&
             this.selectedButton.classList.contains("searchbar-engine-one-off-item");
-          // Typing de-selects the settings or opensearch buttons at the bottom
-          // of the search panel, as typing shows the user intends to search.
-          if (this.selectedButton && !isOneOffSelected)
-            this.selectedButton = null;
           if (textbox.value) {
             self.removeAttribute("showonlysettings");
             groupText = headerSearchText.previousSibling.value +
diff --git a/browser/components/search/test/browser_searchbar_keyboard_navigation.js b/browser/components/search/test/browser_searchbar_keyboard_navigation.js
index 86cc76c567ea..c7d8726c7f85 100644
--- a/browser/components/search/test/browser_searchbar_keyboard_navigation.js
+++ b/browser/components/search/test/browser_searchbar_keyboard_navigation.js
@@ -152,23 +152,6 @@ add_task(function* test_arrows() {
      "the textfield value should be back to initial value");
 });
 
-add_task(function* test_typing_clears_button_selection() {
-  is(Services.focus.focusedElement, textbox.inputField,
-     "the search bar should be focused"); // from the previous test.
-  ok(!textbox.selectedButton, "no button should be selected");
-
-  EventUtils.synthesizeKey("VK_UP", {});
-  is(textbox.selectedButton.getAttribute("anonid"), "search-settings",
-     "the settings item should be selected");
-
-  // Type a character.
-  EventUtils.synthesizeKey("a", {});
-  ok(!textbox.selectedButton, "the settings item should be de-selected");
-
-  // Remove the character.
-  EventUtils.synthesizeKey("VK_BACK_SPACE", {});
-});
-
 add_task(function* test_tab() {
   is(Services.focus.focusedElement, textbox.inputField,
      "the search bar should be focused"); // from the previous test.