Move DownloadControllerAndroid from content/ to chrome/

chrome/android/javatests/src/org/chromium/chrome/browser/download/ChromeDownloadDelegateTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/download/ChromeDownloadDelegateTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/download/ChromeDownloadDelegateTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/download/ChromeDownloadDelegateTest.java
index b36c5e7552e758303495fe7199e8182a8b0ce451..91fe99d42ac21f1da611b969f94f09c282aad392 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/download/ChromeDownloadDelegateTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/download/ChromeDownloadDelegateTest.java
@@ -7,11 +7,13 @@ package org.chromium.chrome.browser.download;
 import android.content.Context;
 import android.test.suitebuilder.annotation.SmallTest;
 
+import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.test.ChromeActivityTestCaseBase;
-import org.chromium.content.browser.DownloadInfo;
+
+import java.util.concurrent.Callable;
 
 /**
  * Tests for ChromeDownloadDelegate class.
@@ -46,10 +48,17 @@ public class ChromeDownloadDelegateTest extends ChromeActivityTestCaseBase<Chrom
      */
     @SmallTest
     @Feature({"Download"})
-    public void testShouldInterceptContextMenuDownload() {
-        Tab tab = new Tab(0, false, getActivity().getWindowAndroid());
-        ChromeDownloadDelegate delegate =
-                new MockChromeDownloadDelegate(getInstrumentation().getTargetContext(), tab);
+    public void testShouldInterceptContextMenuDownload() throws InterruptedException {
+        final Tab tab = getActivity().getActivityTab();
+        loadUrl("about:blank");
+        ChromeDownloadDelegate delegate = ThreadUtils.runOnUiThreadBlockingNoException(
+                new Callable<ChromeDownloadDelegate>() {
+                    @Override
+                    public ChromeDownloadDelegate call() {
+                        return new MockChromeDownloadDelegate(
+                                getInstrumentation().getTargetContext(), tab);
+                    }
+                });
         assertFalse(delegate.shouldInterceptContextMenuDownload("file://test/test.html"));
         assertFalse(delegate.shouldInterceptContextMenuDownload("http://test/test.html"));
         assertFalse(delegate.shouldInterceptContextMenuDownload("ftp://test/test.dm"));