Download later: Add a prompt status pref.

The prompt status pref for download later dialog is similar to the
prompt status used in the download location dialog. The checkbox and
the setting UX spec is the same as well.

Bug: 1078454
Change-Id: Ibaea0c63782b8fb4e33fc1336c862a015c9d219a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2236213Reviewed-by: Shakti Sahu <shaktisahu@chromium.org>
Commit-Queue: Xing Liu <xingliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#776200}

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

@@ -254,6 +254,22 @@ public class DownloadDialogBridge implements ModalDialogProperties.Controller {
         PrefServiceBridge.getInstance().setInteger(Pref.PROMPT_FOR_DOWNLOAD_ANDROID, status);
     }
 
+    /**
+     * @return The prompt status for download later dialog.
+     */
+    @DownloadLaterPromptStatus
+    public static int getDownloadLaterPromptStatus() {
+        return PrefServiceBridge.getInstance().getInteger(Pref.DOWNLOAD_LATER_PROMPT_STATUS);
+    }
+
+    /**
+     * Sets the prompt status for download later dialog.
+     * @param status New status to update the download later prmopt status.
+     */
+    public static void setDownloadLaterPromptStatus(@DownloadLaterPromptStatus int status) {
+        PrefServiceBridge.getInstance().setInteger(Pref.DOWNLOAD_LATER_PROMPT_STATUS, status);
+    }
+
     @NativeMethods
     interface Natives {
         void onComplete(long nativeDownloadDialogBridge, DownloadDialogBridge caller,

chrome/browser/download/download_prefs.cc

@@ -36,6 +36,7 @@
 #include "chrome/common/chrome_features.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/pref_names.h"
+#include "components/download/public/common/download_features.h"
 #include "components/download/public/common/download_item.h"
 #include "components/policy/core/browser/url_blacklist_manager.h"
 #include "components/pref_registry/pref_registry_syncable.h"
@@ -303,6 +304,14 @@ void DownloadPrefs::RegisterProfilePrefs(
       prefs::kPromptForDownloadAndroid,
       static_cast<int>(download_prompt_status),
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+
+  if (base::FeatureList::IsEnabled(download::features::kDownloadLater)) {
+    registry->RegisterIntegerPref(
+        prefs::kDownloadLaterPromptStatus,
+        static_cast<int>(DownloadLaterPromptStatus::SHOW_INITIAL),
+        user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+  }
+
   registry->RegisterBooleanPref(
       prefs::kShowMissingSdCardErrorAndroid,
       base::FeatureList::IsEnabled(features::kDownloadsLocationChange));

chrome/browser/download/download_prefs_unittest.cc

@@ -6,9 +6,11 @@
 
 #include "base/files/file_path.h"
 #include "base/test/metrics/histogram_tester.h"
+#include "base/test/scoped_feature_list.h"
 #include "chrome/browser/download/download_prompt_status.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
+#include "components/download/public/common/download_features.h"
 #include "components/prefs/pref_service.h"
 #include "components/prefs/scoped_user_pref_update.h"
 #include "components/safe_browsing/core/file_type_policies.h"
@@ -40,18 +42,29 @@ TEST(DownloadPrefsTest, RegisterPrefs) {
   content::BrowserTaskEnvironment task_environment_;
   base::HistogramTester histogram_tester;
 
+#ifdef OS_ANDROID
+  base::test::ScopedFeatureList feature_list;
+  feature_list.InitAndEnableFeature(download::features::kDownloadLater);
+#endif  // OS_ANDROID
+
   // Download prefs are registered when creating the profile.
   TestingProfile profile;
   DownloadPrefs prefs(&profile);
 
 #ifdef OS_ANDROID
-  // Download prompt pref should be registered correctly.
+  // Download prompt prefs should be registered correctly.
   histogram_tester.ExpectBucketCount("MobileDownload.DownloadPromptStatus",
                                      DownloadPromptStatus::SHOW_INITIAL, 1);
   int prompt_status = profile.GetTestingPrefService()->GetInteger(
       prefs::kPromptForDownloadAndroid);
   EXPECT_EQ(prompt_status,
             static_cast<int>(DownloadPromptStatus::SHOW_INITIAL));
+
+  int download_later_prompt_status =
+      profile.GetTestingPrefService()->GetInteger(
+          prefs::kDownloadLaterPromptStatus);
+  EXPECT_EQ(download_later_prompt_status,
+            static_cast<int>(DownloadLaterPromptStatus::SHOW_INITIAL));
 #endif  // OS_ANDROID
 }
 

chrome/browser/download/download_prompt_status.h

@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_DOWNLOAD_DOWNLOAD_PROMPT_STATUS_H_
 #define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_PROMPT_STATUS_H_
 
-// The status of the download prompt.
+// The status of the download location prompt.
 // A Java counterpart will be generated for this enum.
 // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser.download
 enum class DownloadPromptStatus {
@@ -15,4 +15,14 @@ enum class DownloadPromptStatus {
   MAX_VALUE
 };
 
+// The status of the download later prompt.
+// A Java counterpart will be generated for this enum.
+// GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser.download
+enum class DownloadLaterPromptStatus {
+  SHOW_INITIAL,     // Show the prompt because it hasn't been shown before.
+  SHOW_PREFERENCE,  // Show the prompt because user indicated preference.
+  DONT_SHOW,        // Don't show the prompt because user indicated preference.
+  MAX_VALUE
+};
+
 #endif  // CHROME_BROWSER_DOWNLOAD_DOWNLOAD_PROMPT_STATUS_H_

chrome/common/pref_names.cc

@@ -1662,6 +1662,10 @@ const char kOpenPdfDownloadInSystemReader[] =
 // ask the user where they want to download the file (only for Android).
 const char kPromptForDownloadAndroid[] = "download.prompt_for_download_android";
 
+// The prompt status for the download later dialog.
+const char kDownloadLaterPromptStatus[] =
+    "download.download_later_prompt_status";
+
 // Boolean which specifies whether we should display the missing SD card error.
 // This is only applicable for Android.
 const char kShowMissingSdCardErrorAndroid[] =

chrome/common/pref_names.h

@@ -555,6 +555,7 @@ extern const char kOpenPdfDownloadInSystemReader[];
 #endif
 #if defined(OS_ANDROID)
 extern const char kPromptForDownloadAndroid[];
+extern const char kDownloadLaterPromptStatus[];
 extern const char kShowMissingSdCardErrorAndroid[];
 #endif