Add DownloadControllerAndroid public interface for android.

chrome/browser/component/web_contents_delegate_android/web_contents_delegate_android.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/component/web_contents_delegate_android/web_contents_delegate_android.h"
 
 #include <android/keycodes.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
+#include "content/public/browser/android/download_controller_android.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/invalidate_type.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/page_transition_types.h"
 #include "content/public/common/referrer.h"
 #include "jni/WebContentsDelegateAndroid_jni.h"
 #include "net/http/http_request_headers.h"
 #include "ui/gfx/rect.h"
 #include "webkit/glue/window_open_disposition.h"
 
 using base::android::AttachCurrentThread;
 using base::android::CheckException;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ConvertUTF16ToJavaString;
 using base::android::GetClass;
 using base::android::GetMethodID;
 using base::android::HasClass;
 using base::android::ScopedJavaLocalRef;
+using content::DownloadControllerAndroid;
 using content::DownloadItem;
 using content::JavaScriptDialogCreator;
 using content::RenderViewHost;
 using content::WebContents;
 
 namespace web_contents_delegate_android {
 
 WebContentsDelegateAndroid::WebContentsDelegateAndroid(JNIEnv* env, jobject obj)
     : weak_java_delegate_(env, obj) {
 }
@@ skipping 229 matching lines @@
   Java_WebContentsDelegateAndroid_onUpdateUrl(env,
                                               obj.obj(),
                                               java_url.obj());
 }
 
 bool WebContentsDelegateAndroid::CanDownload(
     RenderViewHost* source,
     int request_id,
     const std::string& request_method) {
   if (request_method == net::HttpRequestHeaders::kGetMethod) {
-    // TODO(leandrogracia): re-enable this when calling DownloadController
-    // doesn't introduce a DEPS layering violation.
-    // DownloadController::GetInstance()->CreateGETDownload(
-    //     source, request_id);
+    DownloadControllerAndroid::Get()->CreateGETDownload(
+        source, request_id);
     return false;
   }
   return true;
 }
 
 void WebContentsDelegateAndroid::OnStartDownload(WebContents* source,
                                                  DownloadItem* download) {
-  // TODO(leandrogracia): re-enable this when calling DownloadController
-  // doesn't introduce a DEPS layering violation.
-  // DownloadController::GetInstance()->OnPostDownloadStarted(
-  //     source, download);
+  DownloadControllerAndroid::Get()->OnPostDownloadStarted(
+      source, download);

[joth, 2012/10/12 18:55:13]

I'd suggest deleting these 2 methods from here, put them in the two sub-classes
instead (browser & webview)

[nilesh, 2012/10/12 19:23:22]

I assume the plan is to move everything out of this file in the long term.
Otherwise it does not make sense to have two copies of the same implementation.

 }
 
 bool WebContentsDelegateAndroid::ShouldOverrideLoading(const GURL& url) {
   if (!url.is_valid())
     return false;
 
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env);
   if (obj.is_null())
     return WebContentsDelegate::ShouldOverrideLoading(url);
@@ skipping 35 matching lines @@
 
 bool RegisterWebContentsDelegateAndroid(JNIEnv* env) {
   if (!HasClass(env, kWebContentsDelegateAndroidClassPath)) {
     DLOG(ERROR) << "Unable to find class WebContentsDelegateAndroid!";
     return false;
   }
   return RegisterNativesImpl(env);
 }
 
 }  // namespace web_contents_delegate_android