Wait for download manager init before restoring history.

Previously download manager may not have been initialized before we
attempted to restore downloads to holding space. This resulted in
downloads not being restored.

Bug: 1111995
Change-Id: Ie52832ff798d32a466192926302519e0c93a05da
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2398483
Commit-Queue: David Black <dmblack@google.com>
Reviewed-by: David Black <dmblack@google.com>
Reviewed-by: Ahmed Mehfooz <amehfooz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#806738}

chrome/browser/ui/ash/holding_space/holding_space_downloads_delegate.cc

@@ -47,13 +47,28 @@ void HoldingSpaceDownloadsDelegate::OnHoldingSpaceModelRestored() {
           ? download_manager_for_testing
           : content::BrowserContext::GetDownloadManager(profile());
 
+  if (download_manager->IsManagerInitialized())
+    OnManagerInitialized();
+}
+
+void HoldingSpaceDownloadsDelegate::OnManagerInitialized() {
+  if (is_restoring())
+    return;
+
+  content::DownloadManager* download_manager =
+      download_manager_for_testing
+          ? download_manager_for_testing
+          : content::BrowserContext::GetDownloadManager(profile());
+
+  DCHECK(download_manager->IsManagerInitialized());
+
   download::SimpleDownloadManager::DownloadVector downloads;
   download_manager->GetAllDownloads(&downloads);
 
   for (auto* download : downloads) {
     switch (download->GetState()) {
       case download::DownloadItem::COMPLETE:
-        item_downloaded_callback_.Run(download->GetFullPath());
+        OnDownloadCompleted(download);
         break;
       case download::DownloadItem::IN_PROGRESS:
         download_item_observer_.Add(download);

chrome/browser/ui/ash/holding_space/holding_space_downloads_delegate.h

@@ -51,6 +51,7 @@ class HoldingSpaceDownloadsDelegate : public HoldingSpaceKeyedServiceDelegate,
   void OnHoldingSpaceModelRestored() override;
 
   // content::DownloadManager::Observer:
+  void OnManagerInitialized() override;
   void ManagerGoingDown(content::DownloadManager* manager) override;
   void OnDownloadCreated(content::DownloadManager* manager,
                          download::DownloadItem* item) override;

chrome/browser/ui/ash/holding_space/holding_space_keyed_service.cc

@@ -102,6 +102,12 @@ void HoldingSpaceKeyedService::AddScreenshot(
 
 void HoldingSpaceKeyedService::AddDownload(
     const base::FilePath& download_file) {
+  const bool already_exists =
+      holding_space_model_.GetItem(HoldingSpaceItem::GetFileBackedItemId(
+          HoldingSpaceItem::Type::kDownload, download_file));
+  if (already_exists)
+    return;
+
   GURL file_system_url =
       holding_space_util::ResolveFileSystemUrl(profile_, download_file);
   if (file_system_url.is_empty())

chrome/browser/ui/ash/holding_space/holding_space_keyed_service_unittest.cc

@@ -600,6 +600,10 @@ class HoldingSpaceKeyedServiceDownloadsTest
     MockDownloadManager* mock_download_manager = download_manager();
     HoldingSpaceDownloadsDelegate::SetDownloadManagerForTesting(
         mock_download_manager);
+
+    // Spoof initialization of the `mock_download_manager`.
+    ON_CALL(*mock_download_manager, IsManagerInitialized)
+        .WillByDefault(testing::Return(true));
   }
 
   std::unique_ptr<MockDownloadManager> download_manager_;