[Android] Remove non-static version of TouchCommon.

chrome/test/android/javatests/src/org/chromium/chrome/test/util/InfoBarUtil.java

Index: chrome/test/android/javatests/src/org/chromium/chrome/test/util/InfoBarUtil.java
diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/InfoBarUtil.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/InfoBarUtil.java
index cafacff426c42262ec3e4de0dee5495e5342bd6b..7a9e37c3c7fdac6271331fc4b6dfbb7d435cd4f8 100644
--- a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/InfoBarUtil.java
+++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/InfoBarUtil.java
@@ -4,7 +4,6 @@
 
 package org.chromium.chrome.test.util;
 
-import android.test.ActivityInstrumentationTestCase2;
 import android.view.View;
 
 import org.chromium.chrome.R;
@@ -19,11 +18,10 @@ public class InfoBarUtil {
      * Finds, and optionally clicks, the button with the specified ID in the given InfoBar.
      * @return True if the View was found.
      */
-    private static boolean findButton(ActivityInstrumentationTestCase2<?> test,
-            InfoBar infoBar, int buttonId, boolean click) {
+    private static boolean findButton(InfoBar infoBar, int buttonId, boolean click) {
         View button = infoBar.getContentWrapper().findViewById(buttonId);
         if (button == null) return false;
-        if (click) new TouchCommon(test).singleClickView(button);
+        if (click) TouchCommon.singleClickView(button);
         return true;
     }
 
@@ -31,44 +29,39 @@ public class InfoBarUtil {
      * Checks if the primary button exists on the InfoBar.
      * @return True if the View was found.
      */
-    public static boolean hasPrimaryButton(ActivityInstrumentationTestCase2<?> test,
-            InfoBar infoBar) {
-        return findButton(test, infoBar, R.id.button_primary, false);
+    public static boolean hasPrimaryButton(InfoBar infoBar) {
+        return findButton(infoBar, R.id.button_primary, false);
     }
 
     /**
      * Checks if the secondary button exists on the InfoBar.
      * @return True if the View was found.
      */
-    public static boolean hasSecondaryButton(ActivityInstrumentationTestCase2<?> test,
-            InfoBar infoBar) {
-        return findButton(test, infoBar, R.id.button_secondary, false);
+    public static boolean hasSecondaryButton(InfoBar infoBar) {
+        return findButton(infoBar, R.id.button_secondary, false);
     }
 
     /**
      * Simulates clicking the Close button in the specified infobar.
      * @return True if the View was found.
      */
-    public static boolean clickCloseButton(ActivityInstrumentationTestCase2<?> test,
-            InfoBar infoBar) {
-        return findButton(test, infoBar, R.id.infobar_close_button, true);
+    public static boolean clickCloseButton(InfoBar infoBar) {
+        return findButton(infoBar, R.id.infobar_close_button, true);
     }
 
     /**
      * Simulates clicking the primary button in the specified infobar.
      * @return True if the View was found.
      */
-    public static boolean clickPrimaryButton(ActivityInstrumentationTestCase2<?> test,
-            InfoBar infoBar) {
-        return findButton(test, infoBar, R.id.button_primary, true);
+    public static boolean clickPrimaryButton(InfoBar infoBar) {
+        return findButton(infoBar, R.id.button_primary, true);
     }
 
     /**
      * Simulates clicking the secondary button in the specified infobar.
      * @return True if the View was found.
      */
-    public static boolean clickSecondaryButton(ActivityInstrumentationTestCase2<?> test,
-            InfoBar infoBar) {
-        return findButton(test, infoBar, R.id.button_secondary, true);
+    public static boolean clickSecondaryButton(InfoBar infoBar) {
+        return findButton(infoBar, R.id.button_secondary, true);
     }
 }