Revert of Switch back to open image in new tab where applicable.

chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/ContextMenuTest.java

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.contextmenu;
 
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.os.Environment;
 import android.test.suitebuilder.annotation.LargeTest;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.view.ContextMenu;
 import android.view.KeyEvent;
 
+import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.DisableIf;
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.compositor.layouts.LayoutManager;
 import org.chromium.chrome.browser.download.DownloadTestBase;
 import org.chromium.chrome.browser.tab.Tab;
-import org.chromium.chrome.browser.tabmodel.EmptyTabModelSelectorObserver;
 import org.chromium.chrome.browser.tabmodel.TabModel;
-import org.chromium.chrome.test.util.ChromeTabUtils;
 import org.chromium.chrome.test.util.browser.contextmenu.ContextMenuUtils;
-import org.chromium.content.browser.test.util.CallbackHelper;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.content.browser.test.util.DOMUtils;
+import org.chromium.content.browser.test.util.TestCallbackHelperContainer;
+import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnPageFinishedHelper;
 import org.chromium.content.browser.test.util.TestTouchUtils;
 import org.chromium.net.test.EmbeddedTestServer;
 
 import java.io.IOException;
+import java.util.concurrent.Callable;
 import java.util.concurrent.TimeoutException;
-import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * Context menu related tests
  */
 @CommandLineFlags.Add(ChromeSwitches.GOOGLE_BASE_URL + "=http://example.com/")
 public class ContextMenuTest extends DownloadTestBase {
     private static final String TEST_PATH =
             "/chrome/test/data/android/contextmenu/context_menu_test.html";
 
     private EmbeddedTestServer mTestServer;
@@ skipping 56 matching lines @@
         Tab tab = getActivity().getActivityTab();
         ContextMenuUtils.selectContextMenuItem(this, tab, "copyLinkTextComplex",
                 R.id.contextmenu_copy_link_text);
 
         assertEquals("Clipboard text was not what was expected",
                 "This is pretty extreme \n(newline). ", getClipboardText());
     }
 
     @MediumTest
     @Feature({"Browser"})
-    @CommandLineFlags.Add(ChromeSwitches.DISABLE_DOCUMENT_MODE)
     public void testLongPressOnImage() throws InterruptedException, TimeoutException {
-        checkOpenImageInNewTab(
-                "testImage", "/chrome/test/data/android/contextmenu/test_image.png");
+        final Tab tab = getActivity().getActivityTab();
+
+        TestCallbackHelperContainer helper =
+                new TestCallbackHelperContainer(tab.getContentViewCore());
+
+        OnPageFinishedHelper callback = helper.getOnPageFinishedHelper();
+        int callbackCount = callback.getCallCount();
+
+        ContextMenuUtils.selectContextMenuItem(this, tab, "testImage",
+                R.id.contextmenu_open_image);
+
+        callback.waitForCallback(callbackCount);
+
+        String expectedUrl = mTestServer.getURL(
+                "/chrome/test/data/android/contextmenu/test_image.png");
+
+        String actualUrl = ThreadUtils.runOnUiThreadBlockingNoException(new Callable<String>() {
+            @Override
+            public String call() throws Exception {
+                return tab.getUrl();
+            }
+        });
+
+        assertEquals("Failed to navigate to the image", expectedUrl, actualUrl);
     }
 
     @MediumTest
     @Feature({"Browser"})
-    @CommandLineFlags.Add(ChromeSwitches.DISABLE_DOCUMENT_MODE)
     public void testLongPressOnImageLink() throws InterruptedException, TimeoutException {
-        checkOpenImageInNewTab(
-                "testImageLink", "/chrome/test/data/android/contextmenu/test_image.png");
-    }
+        final Tab tab = getActivity().getActivityTab();
 
-    private void checkOpenImageInNewTab(String domId, String expectedUrl)
-            throws InterruptedException, TimeoutException {
-        final Tab activityTab = getActivity().getActivityTab();
+        TestCallbackHelperContainer helper =
+                new TestCallbackHelperContainer(tab.getContentViewCore());
 
-        final CallbackHelper newTabCallback = new CallbackHelper();
-        final AtomicReference<Tab> newTab = new AtomicReference<>();
-        getActivity().getTabModelSelector().addObserver(new EmptyTabModelSelectorObserver() {
+        OnPageFinishedHelper callback = helper.getOnPageFinishedHelper();
+        int callbackCount = callback.getCallCount();
+
+        ContextMenuUtils.selectContextMenuItem(this, tab, "testImage",
+                R.id.contextmenu_open_image);
+
+        callback.waitForCallback(callbackCount);
+
+        String actualTitle = ThreadUtils.runOnUiThreadBlockingNoException(new Callable<String>() {
             @Override
-            public void onNewTabCreated(Tab tab) {
-                super.onNewTabCreated(tab);
-
-                if (tab.getParentId() != activityTab.getId()) return;
-                newTab.set(tab);
-                newTabCallback.notifyCalled();
-
-                getActivity().getTabModelSelector().removeObserver(this);
+            public String call() throws Exception {
+                return tab.getTitle();
             }
         });
 
-        int callbackCount = newTabCallback.getCallCount();
-
-        ContextMenuUtils.selectContextMenuItem(this, activityTab, domId,
-                R.id.contextmenu_open_image_in_new_tab);
-
-        try {
-            newTabCallback.waitForCallback(callbackCount);
-        } catch (TimeoutException ex) {
-            fail("New tab never created from context menu press");
-        }
-
-        ChromeTabUtils.waitForTabPageLoaded(newTab.get(), mTestServer.getURL(expectedUrl));
+        assertTrue("Navigated to the wrong page.", actualTitle.startsWith("test_image.png"));
     }
 
     @MediumTest
     @Feature({"Browser"})
     public void testDismissContextMenuOnBack() throws InterruptedException, TimeoutException {
         Tab tab = getActivity().getActivityTab();
         ContextMenu menu = ContextMenuUtils.openContextMenu(this, tab, "testImage");
         assertNotNull("Context menu was not properly created", menu);
         assertFalse("Context menu did not have window focus", getActivity().hasWindowFocus());
 
@@ skipping 134 matching lines @@
         assertNotNull("Primary clip is null", clipData);
         assertTrue("Primary clip contains no items.", clipData.getItemCount() > 0);
         return clipData.getItemAt(0).getText().toString();
     }
 
     private void assertStringContains(String subString, String superString) {
         assertTrue("String '" + superString + "' does not contain '" + subString + "'",
                 superString.contains(subString));
     }
 }