Remove unused WindowAndroid parameter from TabModelSelectorFactory

chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManager.java

Index: chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManager.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManager.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManager.java
index 57c3a434bb34b2613284bd0becc47f65e7578cc4..7aa3081b02372271d16ef897cbb1596e101e2b50 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManager.java
@@ -40,13 +40,10 @@ public class TabWindowManager implements ActivityStateListener {
         /**
          * Builds a {@link TabModelSelector}.
          * @param activity      A {@link ChromeActivity} instance.
-         * @param windowAndroid A {@link WindowAndroid} instance that should connect to
-         *                      {@code activity}.
          * @param selectorIndex The index of the {@link TabModelSelector}.
          * @return              A new {@link TabModelSelector} instance.
          */
-        TabModelSelector buildSelector(ChromeActivity activity, WindowAndroid windowAndroid,
-                int selectorIndex);
+        TabModelSelector buildSelector(ChromeActivity activity, int selectorIndex);
     }
 
     /** The singleton reference. */
@@ -54,10 +51,9 @@ public class TabWindowManager implements ActivityStateListener {
 
     private TabModelSelectorFactory mSelectorFactory = new DefaultTabModelSelectorFactory();
 
-    private List<TabModelSelector> mSelectors = new ArrayList<TabModelSelector>();
+    private List<TabModelSelector> mSelectors = new ArrayList<>();
 
-    private Map<Activity, TabModelSelector> mAssignments =
-            new HashMap<Activity, TabModelSelector>();
+    private Map<Activity, TabModelSelector> mAssignments = new HashMap<>();
 
     /**
      * @return The singleton instance of {@link TabWindowManager}.
@@ -73,17 +69,13 @@ public class TabWindowManager implements ActivityStateListener {
      * {@link TabModelSelector} returned might not actually be the one related to {@code index}
      * and {@link #getIndexForWindow(Activity)} should be called to grab the actual index if
      * required.
-     * @param activity An instance of {@link ChromeActivity}.  Must be the same {@link Activity} as
-     *                 the one referenced by {@code window}.
-     * @param window   A {@link WindowAndroid} as an instance.  The {@link TabModelSelector} that is
-     *                 created is bound to the {@link Activity} stored inside this window.
+     * @param activity An instance of {@link ChromeActivity}.
      * @param index    The index of the requested {@link TabModelSelector}.  Not guaranteed to be
      *                 the index of the {@link TabModelSelector} returned.
      * @return         A {@link TabModelSelector} index, or {@code null} if there are too many
      *                 {@link TabModelSelector}s already built.
      */
-    public TabModelSelector requestSelector(ChromeActivity activity, WindowAndroid window,
-            int index) {
+    public TabModelSelector requestSelector(ChromeActivity activity, int index) {
         if (mAssignments.get(activity) != null) {
             return mAssignments.get(activity);
         }
@@ -102,7 +94,7 @@ public class TabWindowManager implements ActivityStateListener {
         // Too many activities going at once.
         if (mSelectors.get(index) != null) return null;
 
-        TabModelSelector selector = mSelectorFactory.buildSelector(activity, window, index);
+        TabModelSelector selector = mSelectorFactory.buildSelector(activity, index);
         mSelectors.set(index, selector);
         mAssignments.put(activity, selector);
 
@@ -208,12 +200,10 @@ public class TabWindowManager implements ActivityStateListener {
 
     private static class DefaultTabModelSelectorFactory implements TabModelSelectorFactory {
         @Override
-        public TabModelSelector buildSelector(ChromeActivity activity, WindowAndroid windowAndroid,
-                int selectorIndex) {
-            assert activity == windowAndroid.getActivity().get();
+        public TabModelSelector buildSelector(ChromeActivity activity, int selectorIndex) {
             TabPersistencePolicy persistencePolicy = new TabbedModeTabPersistencePolicy(
                     selectorIndex);
-            return new TabModelSelectorImpl(activity, persistencePolicy, windowAndroid, true);
+            return new TabModelSelectorImpl(activity, persistencePolicy, true);
         }
     }
 }