Revert 146000 - Split out ContentViewCore from ContentView for embedders.

content/public/android/java/src/org/chromium/content/browser/DownloadController.java

Index: content/public/android/java/src/org/chromium/content/browser/DownloadController.java
===================================================================
--- content/public/android/java/src/org/chromium/content/browser/DownloadController.java	(revision 146004)
+++ content/public/android/java/src/org/chromium/content/browser/DownloadController.java	(working copy)
@@ -31,11 +31,11 @@
         nativeInit();
     }
 
-    private static DownloadListener listenerFromView(ContentViewCore view) {
+    private static DownloadListener listenerFromView(ContentView view) {
         return view.downloadListener();
     }
 
-    private static ContentViewDownloadDelegate downloadDelegateFromView(ContentViewCore view) {
+    private static ContentViewDownloadDelegate downloadDelegateFromView(ContentView view) {
         return view.getDownloadDelegate();
     }
 
@@ -50,7 +50,7 @@
      * The DownloadListener is expected to handle the download.
      */
     @CalledByNative
-    public void newHttpGetDownload(ContentViewCore view, String url,
+    public void newHttpGetDownload(ContentView view, String url,
             String userAgent, String contentDisposition, String mimetype,
             String cookie, long contentLength) {
         ContentViewDownloadDelegate downloadDelagate = downloadDelegateFromView(view);
@@ -72,7 +72,7 @@
      * Notifies the DownloadListener that a new POST download has started.
      */
     @CalledByNative
-    public void onHttpPostDownloadStarted(ContentViewCore view) {
+    public void onHttpPostDownloadStarted(ContentView view) {
         ContentViewDownloadDelegate downloadDelagate = downloadDelegateFromView(view);
 
         if (downloadDelagate != null) {
@@ -85,7 +85,7 @@
      * download.
      */
     @CalledByNative
-    public void onHttpPostDownloadCompleted(ContentViewCore view, String url,
+    public void onHttpPostDownloadCompleted(ContentView view, String url,
             String contentDisposition, String mimetype, String path,
             long contentLength, boolean successful) {
         ContentViewDownloadDelegate downloadDelagate = downloadDelegateFromView(view);