Remove some dependencies on ContentView.

content/public/android/javatests/src/org/chromium/content/browser/ViewportTest.java

Index: content/public/android/javatests/src/org/chromium/content/browser/ViewportTest.java
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/ViewportTest.java b/content/public/android/javatests/src/org/chromium/content/browser/ViewportTest.java
index 22a6a2be15a430808fb4b4a351001cceb43f48c7..9c7a34b1253ea09518f7e3ac58cfbe6e344710f5 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/ViewportTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/ViewportTest.java
@@ -10,29 +10,15 @@ import android.view.WindowManager;
 
 import org.chromium.base.test.util.DisabledTest;
 import org.chromium.content.browser.test.util.JavaScriptUtils;
-import org.chromium.content.browser.test.util.TestCallbackHelperContainer;
 
 /**
  * Test suite for viewport-related properties.
  */
 public class ViewportTest extends ContentViewTestBase {
 
-    private TestCallbackHelperContainer mCallbackHelper;
-
-    /**
-     * Returns the TestCallbackHelperContainer associated with this ContentView,
-     * or creates it lazily.
-     */
-    protected TestCallbackHelperContainer getTestCallbackHelperContainer() {
-        if (mCallbackHelper == null) {
-            mCallbackHelper = new TestCallbackHelperContainer(getContentView());
-        }
-        return mCallbackHelper;
-    }
-
     protected String evaluateStringValue(String expression) throws Throwable {
         return JavaScriptUtils.executeJavaScriptAndWaitForResult(getContentViewCore(),
-                getTestCallbackHelperContainer(), expression);
+                expression);
     }
 
     protected float evaluateFloatValue(String expression) throws Throwable {