Download later: Plumb DownloadSchedule through JNI bridge.

This CL passes download later data through DownloadDialogBridge.

Bug: 1078454
Change-Id: Idd2cbbded85ce25e630bf37ad523254cfec9265c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2233361Reviewed-by: Min Qin <qinmin@chromium.org>
Commit-Queue: Xing Liu <xingliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#775788}

chrome/browser/download/android/download_dialog_bridge.cc

@@ -82,12 +82,23 @@ void DownloadDialogBridge::ShowDialog(gfx::NativeWindow native_window,
 void DownloadDialogBridge::OnComplete(
     JNIEnv* env,
     const base::android::JavaParamRef<jobject>& obj,
-    const base::android::JavaParamRef<jstring>& returned_path) {
+    const base::android::JavaParamRef<jstring>& returned_path,
+    jboolean on_wifi,
+    jlong start_time) {
   DownloadDialogResult dialog_result;
   dialog_result.location_result = DownloadLocationDialogResult::USER_CONFIRMED;
   dialog_result.file_path = base::FilePath(
       base::android::ConvertJavaStringToUTF8(env, returned_path));
 
+  if (on_wifi) {
+    dialog_result.download_schedule =
+        download::DownloadSchedule(true /*on_wifi*/);
+  }
+  if (start_time > 0) {
+    dialog_result.download_schedule =
+        download::DownloadSchedule(base::Time::FromJavaTime(start_time));
+  }
+
   CompleteSelection(std::move(dialog_result));
   is_dialog_showing_ = false;
 }

chrome/browser/download/android/download_dialog_bridge.h

@@ -31,6 +31,7 @@ struct DownloadDialogResult {
 
 // Used to show a dialog for the user to select download details, such as file
 // location, file name. and download start time.
+// TODO(xingliu): Move logic out of the bridge, and write a test.
 class DownloadDialogBridge {
  public:
   using DialogCallback = base::OnceCallback<void(DownloadDialogResult)>;
@@ -50,7 +51,9 @@ class DownloadDialogBridge {
 
   void OnComplete(JNIEnv* env,
                   const base::android::JavaParamRef<jobject>& obj,
-                  const base::android::JavaParamRef<jstring>& returned_path);
+                  const base::android::JavaParamRef<jstring>& returned_path,
+                  jboolean on_wifi,
+                  jlong start_time);
 
   void OnCanceled(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
 

chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/DownloadDialogBridge.java

@@ -29,6 +29,7 @@ import java.util.ArrayList;
  * Helper class to handle communication between download location dialog and native.
  */
 public class DownloadDialogBridge implements ModalDialogProperties.Controller {
+    private static final long INVALID_START_TIME = -1;
     private long mNativeDownloadDialogBridge;
     private PropertyModel mDialogModel;
     private DownloadLocationCustomView mCustomView;
@@ -119,8 +120,9 @@ public class DownloadDialogBridge implements ModalDialogProperties.Controller {
             if (dir.type == DirectoryOption.DownloadLocationDirectoryType.DEFAULT) {
                 assert (!TextUtils.isEmpty(dir.location));
                 setDownloadAndSaveFileDefaultDirectory(dir.location);
-                DownloadDialogBridgeJni.get().onComplete(
-                        mNativeDownloadDialogBridge, DownloadDialogBridge.this, mSuggestedPath);
+                DownloadDialogBridgeJni.get().onComplete(mNativeDownloadDialogBridge,
+                        DownloadDialogBridge.this, mSuggestedPath, false /*onWifi*/,
+                        INVALID_START_TIME);
             }
             return;
         }
@@ -202,8 +204,9 @@ public class DownloadDialogBridge implements ModalDialogProperties.Controller {
                     DirectoryOption.DownloadLocationDirectoryType.NUM_ENTRIES);
 
             File file = new File(directoryOption.location, fileName);
-            DownloadDialogBridgeJni.get().onComplete(
-                    mNativeDownloadDialogBridge, DownloadDialogBridge.this, file.getAbsolutePath());
+            DownloadDialogBridgeJni.get().onComplete(mNativeDownloadDialogBridge,
+                    DownloadDialogBridge.this, file.getAbsolutePath(), false /*onWifi*/,
+                    INVALID_START_TIME);
         }
 
         // Update preference to show prompt based on whether checkbox is checked only when the user
@@ -253,8 +256,8 @@ public class DownloadDialogBridge implements ModalDialogProperties.Controller {
 
     @NativeMethods
     interface Natives {
-        void onComplete(
-                long nativeDownloadDialogBridge, DownloadDialogBridge caller, String returnedPath);
+        void onComplete(long nativeDownloadDialogBridge, DownloadDialogBridge caller,
+                String returnedPath, boolean onWifi, long startTime);
         void onCanceled(long nativeDownloadDialogBridge, DownloadDialogBridge caller);
         String getDownloadDefaultDirectory();
         void setDownloadAndSaveFileDefaultDirectory(String directory);