Alternative fix for FindToolbar crash when reparenting.

chrome/android/java/src/org/chromium/chrome/browser/widget/findinpage/FindToolbarManager.java

Index: chrome/android/java/src/org/chromium/chrome/browser/widget/findinpage/FindToolbarManager.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/widget/findinpage/FindToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/widget/findinpage/FindToolbarManager.java
index 946c446891b344e22ca8f3ae8c01d1590c68167c..1d3152b922458baf3cb485ba5f6767938057c95b 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/widget/findinpage/FindToolbarManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/widget/findinpage/FindToolbarManager.java
@@ -4,14 +4,13 @@
 
 package org.chromium.chrome.browser.widget.findinpage;
 
-import android.app.Activity;
 import android.view.ActionMode;
 import android.view.View;
 import android.view.ViewStub;
 
 import org.chromium.base.ObserverList;
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.tabmodel.TabModelSelector;
+import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.ui.base.DeviceFormFactor;
 
 /**
@@ -19,22 +18,18 @@ import org.chromium.ui.base.DeviceFormFactor;
  */
 public class FindToolbarManager {
     private FindToolbar mFindToolbar;
-    private final Activity mActivity;
-    private final TabModelSelector mTabModelSelector;
+    private final ChromeActivity mActivity;
     private final ActionMode.Callback mCallback;
     private final ObserverList<FindToolbarObserver> mObservers;
 
     /**
      * Creates an instance of a {@link FindToolbarManager}.
-     * @param activity An Activity that represents a parent of the {@link android.view.ViewStub}.
-     * @param selector The {@link TabModelSelector} that will interact with the {@link FindToolbar}.
+     * @param activity The ChromeActivity that contains the {@link FindToolbar}.
      * @param callback The ActionMode.Callback that will be used when selection occurs on the
      *         {@link FindToolbar}.
      */
-    public FindToolbarManager(
-            Activity activity, TabModelSelector selector, ActionMode.Callback callback) {
+    public FindToolbarManager(ChromeActivity activity, ActionMode.Callback callback) {
         mActivity = activity;
-        mTabModelSelector = selector;
         mCallback = callback;
         mObservers = new ObserverList<FindToolbarObserver>();
     }
@@ -73,7 +68,8 @@ public class FindToolbarManager {
                 stubId = R.id.find_toolbar_tablet_stub;
             }
             mFindToolbar = (FindToolbar) ((ViewStub) mActivity.findViewById(stubId)).inflate();
-            mFindToolbar.setTabModelSelector(mTabModelSelector);
+            mFindToolbar.setTabModelSelector(mActivity.getTabModelSelector());
+            mFindToolbar.setWindowAndroid(mActivity.getWindowAndroid());
             mFindToolbar.setActionModeCallbackForTextEdit(mCallback);
             mFindToolbar.setObserver(new FindToolbarObserver() {
                 @Override