ScreenCapture for Android phase1, part II

chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabWindowManagerTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabWindowManagerTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabWindowManagerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabWindowManagerTest.java
index 6d810ea7eec96828fe7395f5c035dc906d88c4d8..f14d1a8de2e7c83ce1f91e928ecccaa38ac5161e 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabWindowManagerTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabWindowManagerTest.java
@@ -252,16 +252,27 @@ public class TabWindowManagerTest extends InstrumentationTestCase {
         assertTrue(manager.tabExistsInAnySelector(tab1.getId()));
         assertTrue(manager.tabExistsInAnySelector(tab2.getId()));
         assertFalse(manager.tabExistsInAnySelector(tab2.getId() + 1));
+    }
 
-        AsyncTabParamsManager.getAsyncTabParams().clear();
-        final int asyncTabId = 123;
-        final TabReparentingParams dummyParams = new TabReparentingParams(null, null, null, false);
-        assertFalse(manager.tabExistsInAnySelector(asyncTabId));
-        AsyncTabParamsManager.add(asyncTabId, dummyParams);
-        try {
-            assertTrue(manager.tabExistsInAnySelector(asyncTabId));
-        } finally {
-            AsyncTabParamsManager.getAsyncTabParams().clear();
-        }
+    /**
+     * Tests that getTabById() functions properly.
+     */
+    @SmallTest
+    @Feature({"Multiwindow"})
+    @UiThreadTest
+    public void testGetTabById() {
+        final TabWindowManager manager = TabWindowManager.getInstance();
+
+        ChromeActivity activity0 = buildActivity();
+        ChromeActivity activity1 = buildActivity();
+        MockTabModelSelector selector0 = requestSelector(activity0, 0);
+        MockTabModelSelector selector1 = requestSelector(activity1, 1);
+        Tab tab1 = selector0.addMockTab();
+        Tab tab2 = selector1.addMockIncognitoTab();
+
+        assertNull(manager.getTabById(tab1.getId() - 1));
+        assertNotNull(manager.getTabById(tab1.getId()));
+        assertNotNull(manager.getTabById(tab2.getId()));
+        assertNull(manager.getTabById(tab2.getId() + 1));
     }
 }