Fix a bug where image viewer custom tab has a wrong return stack

chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java
index 25361c603046edc3b82154364245c9900d05c819..3c25a62d517bb7dd68005afecdfd9c05baf06f75 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java
@@ -1448,7 +1448,7 @@ public class CustomTabActivityTest extends CustomTabActivityTestBase {
             @Override
             public void run() {
                 assertFalse(WarmupManager.getInstance().hasSpareWebContents());
-                final CustomTabActivity activity = (CustomTabActivity) getActivity();
+                final CustomTabActivity activity = getActivity();
                 activity.finishAndClose(false);
             }
         });
@@ -1731,12 +1731,6 @@ public class CustomTabActivityTest extends CustomTabActivityTestBase {
                         && newActivity.getActivityTab().equals(tabToBeReparented);
             }
         }));
-        CriteriaHelper.pollUiThread((new Criteria() {
-            @Override
-            public boolean isSatisfied() {
-                return mActivity.isActivityDestroyed();
-            }
-        }));
         assertEquals(newActivity.getWindowAndroid(), tabToBeReparented.getWindowAndroid());
         assertEquals(newActivity.getWindowAndroid(),
                 tabToBeReparented.getContentViewCore().getWindowAndroid());