[Download-Rename] Fix rename unavailable failure in Android Q.

- Rename validation check whether original path exist in disk, in
Android Q path is using ContentUri, Failure of unavailable returned.

- Android Q uses display_name column in media storage, we should
SetDisplayName to update UI before run the callback.

- Fix a missing rename dialog UI state machine transition case.

Bug: 1007503
Change-Id: I2051d99449f39f6910a2ecd70250d6308e731917
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1834949Reviewed-by: David Trainor <dtrainor@chromium.org>
Reviewed-by: Shakti Sahu <shaktisahu@chromium.org>
Commit-Queue: Hesen Zhang <hesen@chromium.org>
Auto-Submit: Hesen Zhang <hesen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#702914}

chrome/android/java/src/org/chromium/chrome/browser/download/home/rename/RenameDialogManager.java

@@ -116,9 +116,11 @@ public class RenameDialogManager {
     private void processDialogState(@RenameDialogState int nextState, int dismissalCause) {
         switch (nextState) {
             case RenameDialogState.NO_DIALOG:
-                if (mCurState == RenameDialogState.RENAME_EXTENSION_DIALOG_DEFAULT) {
+                if (mCurState == RenameDialogState.RENAME_EXTENSION_DIALOG_DEFAULT
+                        || mCurState == RenameDialogState.RENAME_EXTENSION_DIALOG_COMMIT_ERROR) {
                     mRenameExtensionDialogCoordinator.dismissDialog(dismissalCause);
-                } else if (mCurState == RenameDialogState.RENAME_DIALOG_DEFAULT) {
+                } else if (mCurState == RenameDialogState.RENAME_DIALOG_DEFAULT
+                        || mCurState == RenameDialogState.RENAME_DIALOG_COMMIT_ERROR) {
                     mRenameDialogCoordinator.dismissDialog(dismissalCause);
                 }
                 break;

components/download/internal/common/download_item_impl.cc

@@ -677,22 +677,33 @@ void DownloadItemImpl::ShowDownloadInShell() {
   delegate_->ShowDownloadInShell(this);
 }
 
-void DownloadItemImpl::RenameDownloadedFileDone(RenameDownloadCallback callback,
-                                                const base::FilePath& new_path,
-                                                DownloadRenameResult result) {
+void DownloadItemImpl::RenameDownloadedFileDone(
+    RenameDownloadCallback callback,
+    const base::FilePath& display_name,
+    DownloadRenameResult result) {
   if (result == DownloadRenameResult::SUCCESS) {
-    destination_info_.target_path = new_path;
-    destination_info_.current_path = new_path;
+    bool is_content_uri = false;
+#if defined(OS_ANDROID)
+    is_content_uri = GetFullPath().IsContentUri();
+#endif  // defined(OS_ANDROID)
+    if (is_content_uri) {
+      SetDisplayName(display_name);
+    } else {
+      auto new_full_path =
+          base::FilePath(GetFullPath().DirName()).Append(display_name);
+      destination_info_.target_path = new_full_path;
+      destination_info_.current_path = new_full_path;
+    }
     UpdateObservers();
   }
   std::move(callback).Run(result);
 }
 
-void DownloadItemImpl::Rename(const base::FilePath& name,
+void DownloadItemImpl::Rename(const base::FilePath& display_name,
                               DownloadItem::RenameDownloadCallback callback) {
   DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
 
-  if (name.IsAbsolute()) {
+  if (display_name.IsAbsolute()) {
     base::SequencedTaskRunnerHandle::Get()->PostTask(
         FROM_HERE, base::BindOnce(&DownloadItemImpl::RenameDownloadedFileDone,
                                   weak_ptr_factory_.GetWeakPtr(),
@@ -701,14 +712,13 @@ void DownloadItemImpl::Rename(const base::FilePath& name,
     return;
   }
 
-  auto full_path = base::FilePath(GetFullPath().DirName()).Append(name);
-
   base::PostTaskAndReplyWithResult(
       GetDownloadTaskRunner().get(), FROM_HERE,
-      base::BindOnce(&download::RenameDownloadedFile, GetFullPath(), full_path),
+      base::BindOnce(&download::RenameDownloadedFile, GetFullPath(),
+                     display_name),
       base::BindOnce(&DownloadItemImpl::RenameDownloadedFileDone,
                      weak_ptr_factory_.GetWeakPtr(), std::move(callback),
-                     full_path));
+                     display_name));
 }
 
 uint32_t DownloadItemImpl::GetId() const {

components/download/internal/common/download_utils.cc

@@ -45,6 +45,27 @@ const int64_t kInvalidFileWriteOffset = -1;
 // downloads will be deleted after expiration.
 const int kDefaultDownloadExpiredTimeInDays = 90;
 
+#if defined(OS_ANDROID)
+// Default maximum length of a downloaded file name on Android.
+const int kDefaultMaxFileNameLengthOnAndroid = 127;
+
+DownloadItem::DownloadRenameResult RenameDownloadedFileForContentUri(
+    const base::FilePath& from_path,
+    const base::FilePath& display_name) {
+  if (static_cast<int>(display_name.value().length()) >
+      kDefaultMaxFileNameLengthOnAndroid) {
+    return DownloadItem::DownloadRenameResult::FAILURE_NAME_TOO_LONG;
+  }
+
+  if (DownloadCollectionBridge::FileNameExists(display_name))
+    return DownloadItem::DownloadRenameResult::FAILURE_NAME_CONFLICT;
+
+  return DownloadCollectionBridge::RenameDownloadUri(from_path, display_name)
+             ? DownloadItem::DownloadRenameResult::SUCCESS
+             : DownloadItem::DownloadRenameResult::FAILURE_NAME_INVALID;
+}
+#endif  // defined(OS_ANDROID)
+
 void AppendExtraHeaders(net::HttpRequestHeaders* headers,
                         DownloadUrlParameters* params) {
   for (const auto& header : params->request_headers())
@@ -569,9 +590,14 @@ bool DeleteDownloadedFile(const base::FilePath& path) {
   return base::DeleteFile(path, false);
 }
 
-download::DownloadItem::DownloadRenameResult RenameDownloadedFile(
+DownloadItem::DownloadRenameResult RenameDownloadedFile(
     const base::FilePath& from_path,
-    const base::FilePath& to_path) {
+    const base::FilePath& display_name) {
+#if defined(OS_ANDROID)
+  if (from_path.IsContentUri())
+    return RenameDownloadedFileForContentUri(from_path, display_name);
+#endif  // defined(OS_ANDROID)
+  auto to_path = base::FilePath(from_path.DirName()).Append(display_name);
   if (!base::PathExists(from_path) ||
       !base::DirectoryExists(from_path.DirName()))
     return DownloadItem::DownloadRenameResult::FAILURE_UNAVAILABLE;
@@ -590,20 +616,9 @@ download::DownloadItem::DownloadRenameResult RenameDownloadedFile(
       return DownloadItem::DownloadRenameResult::FAILURE_NAME_TOO_LONG;
     }
   }
-#if defined(OS_ANDROID)
-  if (from_path.IsContentUri()) {
-    return DownloadCollectionBridge::RenameDownloadUri(from_path,
-                                                       to_path.BaseName())
-               ? download::DownloadItem::DownloadRenameResult::SUCCESS
-               : download::DownloadItem::DownloadRenameResult::
-                     FAILURE_NAME_INVALID;
-  }
-#endif
-
   return base::Move(from_path, to_path)
-             ? download::DownloadItem::DownloadRenameResult::SUCCESS
-             : download::DownloadItem::DownloadRenameResult::
-                   FAILURE_NAME_INVALID;
+             ? DownloadItem::DownloadRenameResult::SUCCESS
+             : DownloadItem::DownloadRenameResult::FAILURE_NAME_INVALID;
 }
 
 int64_t GetDownloadValidationLengthConfig() {

components/download/public/common/download_utils.h

@@ -98,10 +98,10 @@ COMPONENTS_DOWNLOAD_EXPORT bool IsDownloadDone(
 COMPONENTS_DOWNLOAD_EXPORT bool DeleteDownloadedFile(
     const base::FilePath& path);
 
-// Rename downloaded file from |oldpath| to newname.
-COMPONENTS_DOWNLOAD_EXPORT download::DownloadItem::DownloadRenameResult
+// Rename downloaded file |from_path| to a new |display_name|.
+COMPONENTS_DOWNLOAD_EXPORT DownloadItem::DownloadRenameResult
 RenameDownloadedFile(const base::FilePath& from_path,
-                     const base::FilePath& to_path);
+                     const base::FilePath& display_name);
 
 // Finch parameter key value for number of bytes used for content validation
 // during resumption.