Adds unit tests for AwContentsClientCallbackHelper

android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java

Index: android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java
index cdd9a592ba1dd6a17b77b65ff36037883df769cd..6f27291e9db3e573379a0872ce5aa90f29dc4b82 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java
@@ -16,6 +16,7 @@ import android.util.Pair;
 
 import org.chromium.android_webview.AwContents;
 import org.chromium.android_webview.AwSettings;
+import org.chromium.android_webview.test.TestAwContentsClient.OnDownloadStartHelper;
 import org.chromium.android_webview.test.util.CommonResources;
 import org.chromium.base.test.util.Feature;
 import org.chromium.content.browser.test.util.CallbackHelper;
@@ -34,72 +35,6 @@ import java.util.concurrent.atomic.AtomicInteger;
  * AwContents tests.
  */
 public class AwContentsTest extends AwTestBase {
-    private static class OnDownloadStartHelper extends CallbackHelper {
-        String mUrl;
-        String mUserAgent;
-        String mContentDisposition;
-        String mMimeType;
-        long mContentLength;
-
-        public String getUrl() {
-            assert getCallCount() > 0;
-            return mUrl;
-        }
-
-        public String getUserAgent() {
-            assert getCallCount() > 0;
-            return mUserAgent;
-        }
-
-        public String getContentDisposition() {
-            assert getCallCount() > 0;
-            return mContentDisposition;
-        }
-
-       public String getMimeType() {
-            assert getCallCount() > 0;
-            return mMimeType;
-        }
-
-        public long getContentLength() {
-            assert getCallCount() > 0;
-            return mContentLength;
-        }
-
-        public void notifyCalled(String url, String userAgent, String contentDisposition,
-                String mimeType, long contentLength) {
-            mUrl = url;
-            mUserAgent = userAgent;
-            mContentDisposition = contentDisposition;
-            mMimeType = mimeType;
-            mContentLength = contentLength;
-            notifyCalled();
-        }
-    }
-
-    private static class TestAwContentsClient
-            extends org.chromium.android_webview.test.TestAwContentsClient {
-
-        private OnDownloadStartHelper mOnDownloadStartHelper;
-
-        public TestAwContentsClient() {
-            mOnDownloadStartHelper = new OnDownloadStartHelper();
-        }
-
-        public OnDownloadStartHelper getOnDownloadStartHelper() {
-            return mOnDownloadStartHelper;
-        }
-
-        @Override
-        public void onDownloadStart(String url,
-                                    String userAgent,
-                                    String contentDisposition,
-                                    String mimeType,
-                                    long contentLength) {
-            getOnDownloadStartHelper().notifyCalled(url, userAgent, contentDisposition, mimeType,
-                    contentLength);
-        }
-    }
 
     private TestAwContentsClient mContentsClient = new TestAwContentsClient();