Move DownloadControllerAndroid from content/ to chrome/

chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java

Index: chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
index e376d28cf50b9f3c0dd08b20e903d4dd5841cc18..722caadf901c131d5a3961ebb216fd0264fee67e 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
@@ -1829,9 +1829,12 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener,
                 mContentViewCore.setContentViewClient(mContentViewClient);
             }
 
+            mDownloadDelegate = new ChromeDownloadDelegate(mThemedApplicationContext, this);
+
             assert mNativeTabAndroid != 0;
             nativeInitWebContents(
                     mNativeTabAndroid, mIncognito, mContentViewCore, mWebContentsDelegate,
+                    mDownloadDelegate,
                     new TabContextMenuPopulator(mDelegateFactory.createContextMenuPopulator(this),
                             this));
 
@@ -1858,10 +1861,6 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener,
             // web views.
             mContentViewCore.setShouldSetAccessibilityFocusOnPageLoad(true);
 
-            mDownloadDelegate = new ChromeDownloadDelegate(
-                    mThemedApplicationContext, this);
-            cvc.setDownloadDelegate(mDownloadDelegate);
-
             setInterceptNavigationDelegate(mDelegateFactory.createInterceptNavigationDelegate(
                     this));
 
@@ -3226,7 +3225,7 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener,
     private native void nativeDestroy(long nativeTabAndroid);
     private native void nativeInitWebContents(long nativeTabAndroid, boolean incognito,
             ContentViewCore contentViewCore, TabWebContentsDelegateAndroid delegate,
-            ContextMenuPopulator contextMenuPopulator);
+            ChromeDownloadDelegate downloadDelegate, ContextMenuPopulator contextMenuPopulator);
     private native void nativeUpdateDelegates(long nativeTabAndroid,
             TabWebContentsDelegateAndroid delegate, ContextMenuPopulator contextMenuPopulator);
     private native void nativeDestroyWebContents(long nativeTabAndroid, boolean deleteNative);