From 063cb6cecf08f80d6b1250ccc59f865ee6ff94c2 Mon Sep 17 00:00:00 2001
From: Ed Morley <emorley@mozilla.com>
Date: Thu, 3 Jan 2013 10:03:29 +0000
Subject: [PATCH] Backout 17b390f86130 (bug 823325) for failures in
 test_bug590573.html

---
 mobile/android/chrome/content/browser.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index ca3cc61f8ea0..29d80373d4e9 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -2808,13 +2808,8 @@ Tab.prototype = {
 
     if (aActive) {
       this.browser.setAttribute("type", "content-primary");
+      this.browser.focus();
       this.browser.docShellIsActive = true;
-
-      // setTimeout() is needed to make sure the browser is visible before it
-      // is focused (see bug 823325).
-      setTimeout(function () {
-        this.browser.focus();
-      }.bind(this), 0);
     } else {
       this.browser.setAttribute("type", "content-targetable");
       this.browser.docShellIsActive = false;