Fix bug where UrlBar is focused when entering Reader Mode.

This fixes a bug where entering Reader Mode would cause the URL bar to
gain focus. The problem was that, starting in
https://crrev.com/821393004, Tab.destroyContentViewCore() was removing
the ContentView from the view hierarchy. This caused focus to go
immediately to the URL bar.

BUG=447203

Review URL: https://codereview.chromium.org/833403004

Cr-Commit-Position: refs/heads/master@{#311620}
(cherry picked from commit 7c0fea86f434f4cd1706ff6cc3cbfee709083d5b)

Review URL: https://codereview.chromium.org/862733002

Cr-Commit-Position: refs/branch-heads/2272@{#60}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

1 files changed, 3 insertions, 1 deletions

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/Tab.java b/chrome/android/java/src/org/chromium/chrome/browser/Tab.java
index dfd0ffc..4de565b 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/Tab.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/Tab.java
@@ -1769,7 +1769,9 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener,
 
         destroyContentViewCoreInternal(mContentViewCore);
 
-        mContentViewParent.removeAllViews();
+        if (mInfoBarContainer != null && mInfoBarContainer.getParent() != null) {
+            mInfoBarContainer.removeFromParentView();
+        }
         mContentViewParent = null;
         mContentViewCore.destroy();
         mContentViewCore = null;