From 75451b20b405336353f1496560ecae31d320a874 Mon Sep 17 00:00:00 2001
From: Matt Brubeck <mbrubeck@mozilla.com>
Date: Wed, 27 Nov 2013 08:35:57 -0800
Subject: [PATCH] Bug 943735 - Fix Metro autocomplete binding setters [r=emtwo]

---
 browser/metro/base/content/bindings/urlbar.xml       | 8 ++++++--
 browser/metro/base/tests/mochitest/browser_urlbar.js | 4 ++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/browser/metro/base/content/bindings/urlbar.xml b/browser/metro/base/content/bindings/urlbar.xml
index aa11c0036aa6..eca464254202 100644
--- a/browser/metro/base/content/bindings/urlbar.xml
+++ b/browser/metro/base/content/bindings/urlbar.xml
@@ -551,7 +551,9 @@
         </getter>
         <setter>
           <![CDATA[
-            return this._isGridBound(this._results) ? this._results.selectedItem : null;
+            if (this._isGridBound(this._results)) {
+              this._results.selectedItem = val;
+            }
           ]]>
         </setter>
       </property>
@@ -564,7 +566,9 @@
         </getter>
         <setter>
           <![CDATA[
-            return this._isGridBound(this._results) ? this._results.selectedIndex : -1;
+            if (this._isGridBound(this._results)) {
+              this._results.selectedIndex = val;
+            }
           ]]>
         </setter>
       </property>
diff --git a/browser/metro/base/tests/mochitest/browser_urlbar.js b/browser/metro/base/tests/mochitest/browser_urlbar.js
index d05e5af26a94..e67081d40dd3 100644
--- a/browser/metro/base/tests/mochitest/browser_urlbar.js
+++ b/browser/metro/base/tests/mochitest/browser_urlbar.js
@@ -369,6 +369,10 @@ gTests.push({
 
     EventUtils.synthesizeKey("VK_UP", {}, window);
     is(gEdit.popup._results.selectedIndex, 0, "Pressing arrow up selects first item.");
+
+    EventUtils.synthesizeKey("VK_BACK_SPACE", {}, window);
+    yield waitForEvent(document.getElementById("urlbar-edit"), "input");
+    is(gEdit.popup._results.selectedIndex, -1, "backspace: autocomplete de-selected");
   }
 });