Remove some dependencies on ContentView.

chrome/android/javatests/src/org/chromium/chrome/browser/input/SelectFileDialogTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/input/SelectFileDialogTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/input/SelectFileDialogTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/input/SelectFileDialogTest.java
index f823a16fa7fdae93acb7890950cdfb5343d3c7cd..983d166b7590ac961d384856815351a1f80a9b1d 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/input/SelectFileDialogTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/input/SelectFileDialogTest.java
@@ -18,7 +18,6 @@ import org.chromium.content.browser.ContentView;
 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.UiUtils;
 import org.chromium.ui.base.ActivityWindowAndroid;
 
@@ -37,7 +36,6 @@ public class SelectFileDialogTest extends ChromeShellTestBase {
             "</body></html>");
 
     private ContentView mContentView;
-    private TestCallbackHelperContainer mCallbackContainer;
     private ActivityWindowAndroidForTest mActivityWindowAndroidForTest;
 
     private static class ActivityWindowAndroidForTest extends ActivityWindowAndroid {
@@ -80,12 +78,11 @@ public class SelectFileDialogTest extends ChromeShellTestBase {
         assertTrue("Page failed to load", waitForActiveShellToBeDoneLoading());
 
         mContentView = getActivity().getActiveContentView();
-        mCallbackContainer = new TestCallbackHelperContainer(mContentView);
         // TODO(aurimas) remove this wait once crbug.com/179511 is fixed.
         assertWaitForPageScaleFactorMatch(2);
         assertTrue(
                 DOMUtils.waitForNonZeroNodeBounds(mContentView.getContentViewCore(),
-                        mCallbackContainer, "input_file"));
+                        "input_file"));
     }
 
     /**
@@ -94,20 +91,20 @@ public class SelectFileDialogTest extends ChromeShellTestBase {
     @MediumTest
     @Feature({"TextInput", "Main"})
     public void testSelectFileAndCancelRequest() throws Throwable {
-        DOMUtils.clickNode(this, mContentView, mCallbackContainer, "input_file");
+        DOMUtils.clickNode(this, mContentView, "input_file");
         assertTrue("SelectFileDialog never sent an intent.",
                 CriteriaHelper.pollForCriteria(new IntentSentCriteria()));
         assertEquals(Intent.ACTION_CHOOSER, mActivityWindowAndroidForTest.lastIntent.getAction());
         resetActivityWindowAndroidForTest();
 
-        DOMUtils.clickNode(this, mContentView, mCallbackContainer, "input_image");
+        DOMUtils.clickNode(this, mContentView, "input_image");
         assertTrue("SelectFileDialog never sent an intent.",
                 CriteriaHelper.pollForCriteria(new IntentSentCriteria()));
         assertEquals(MediaStore.ACTION_IMAGE_CAPTURE,
                 mActivityWindowAndroidForTest.lastIntent.getAction());
         resetActivityWindowAndroidForTest();
 
-        DOMUtils.clickNode(this, mContentView, mCallbackContainer, "input_audio");
+        DOMUtils.clickNode(this, mContentView, "input_audio");
         assertTrue("SelectFileDialog never sent an intent.",
                 CriteriaHelper.pollForCriteria(new IntentSentCriteria()));
         assertEquals(MediaStore.Audio.Media.RECORD_SOUND_ACTION,