Move some Chrome-specific code paths out of DownloadManager and into the delegate. Getting rid of...

chrome/browser/download/download_manager.h

 // Copyright (c) 2011 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.
 //
 // The DownloadManager object manages the process of downloading, including
 // updates to the history system and providing the information for displaying
 // the downloads view in the Destinations tab. There is one DownloadManager per
 // active profile in Chrome.
 //
 // Download observers:
@@ skipping 179 matching lines @@
 
   // Display a new download in the appropriate browser UI.
   void ShowDownloadInBrowser(DownloadItem* download);
 
   // The number of in progress (including paused) downloads.
   int in_progress_count() const {
     return static_cast<int>(in_progress_.size());
   }
 
   Profile* profile() { return profile_; }
 

[Paweł Hajdan Jr., 2011/08/12 22:08:45]

nit: I think it'd be slightly better to remove empty lines between accessors. Up
to you.

+  DownloadHistory* download_history() { return download_history_.get(); }
+
   DownloadPrefs* download_prefs() { return download_prefs_.get(); }
 
-#if defined(UNIT_TEST)
-  DownloadHistory* download_history() { return download_history_.get(); }
-#endif
+  FilePath last_download_path() { return last_download_path_; }
 
   // Creates the download item.  Must be called on the UI thread.
   void CreateDownloadItem(DownloadCreateInfo* info);
 
   // Clears the last download path, used to initialize "save as" dialogs.
   void ClearLastDownloadPath();
 
-  // Tests if a file type should be opened automatically.
-  bool ShouldOpenFileBasedOnExtension(const FilePath& path) const;
-
   // Overridden from DownloadStatusUpdaterDelegate:
   virtual bool IsDownloadProgressKnown();
   virtual int64 GetInProgressDownloadCount();
   virtual int64 GetReceivedDownloadBytes();
   virtual int64 GetTotalDownloadBytes();
 
-  // Called by the embedder after the save as dialog is closed.
+  // Called by the delegate after the save as dialog is closed.
   void FileSelected(const FilePath& path, void* params);
   void FileSelectionCanceled(void* params);
 
-  // Returns true if this download should show the "dangerous file" warning.
-  // Various factors are considered, such as the type of the file, whether a
-  // user action initiated the download, and whether the user has explicitly
-  // marked the file type as "auto open".
-  bool IsDangerousFile(const DownloadItem& download,
-                       const DownloadStateInfo& state,
-                       bool visited_referrer_before);
+  // Called by the delegate if it delayed the download in
+  // DownloadManagerDelegate::ShouldStartDownload and now is ready.
+  void RestartDownload(int32 download_id);
 
   // Checks whether downloaded files still exist. Updates state of downloads
   // that refer to removed files. The check runs in the background and may
   // finish asynchronously after this method returns.
   void CheckForHistoryFilesRemoval();
 
   // Checks whether a downloaded file still exists and updates the file's state
   // if the file is already removed. The check runs in the background and may
   // finish asynchronously after this method returns.
   void CheckForFileRemoval(DownloadItem* download_item);
 
-  // Callback function after url is checked with safebrowsing service.
-  void CheckDownloadUrlDone(int32 download_id, bool is_dangerous_url);
-
-  // Callback function after we check whether the referrer URL has been visited
-  // before today.
-  void CheckVisitedReferrerBeforeDone(int32 download_id,
-                                      bool visited_referrer_before);
-
-  // Callback function after download file hash is checked with safebrowsing
-  // service.
-  void CheckDownloadHashDone(int32 download_id, bool is_dangerous_hash);
-
   // Assert the named download item is on the correct queues
   // in the DownloadManager.  For debugging.
   void AssertQueueStateConsistent(DownloadItem* download);
 
   // Get the download item from the history map.  Useful after the item has
   // been removed from the active map, or was retrieved from the history DB.
   DownloadItem* GetDownloadItem(int id);
 
   // Called when Save Page download starts. Transfers ownership of |download|
   // to the DownloadManager.
   void SavePageDownloadStarted(DownloadItem* download);
 
   // Callback when Save Page As entry is commited to the history system.
   void OnSavePageDownloadEntryAdded(int32 download_id, int64 db_handle);
 
   // Called when Save Page download is done.
   void SavePageDownloadFinished(DownloadItem* download);
 
   // Download Id for next Save Page.
   int32 GetNextSavePageId();
 
+  // Get the download item from the active map.  Useful when the item is not
+  // yet in the history map.
+  DownloadItem* GetActiveDownloadItem(int id);
+
   DownloadManagerDelegate* delegate() const { return delegate_; }
 
  private:
   typedef std::set<DownloadItem*> DownloadSet;
   typedef base::hash_map<int64, DownloadItem*> DownloadMap;
 
   // For testing.
   friend class DownloadManagerTest;
   friend class MockDownloadManager;
 
@@ skipping 25 matching lines @@
   virtual ~DownloadManager();
 
   // Called on the FILE thread to check the existence of a downloaded file.
   void CheckForFileRemovalOnFileThread(int64 db_handle, const FilePath& path);
 
   // Called on the UI thread if the FILE thread detects the removal of
   // the downloaded file. The UI thread updates the state of the file
   // and then notifies this update to the file's observer.
   void OnFileRemovalDetected(int64 db_handle);
 
-  // Called on the download thread to check whether the suggested file path
-  // exists.  We don't check if the file exists on the UI thread to avoid UI
-  // stalls from interacting with the file system.
-  void CheckIfSuggestedPathExists(int32 download_id,
-                                  DownloadStateInfo state,
-                                  const FilePath& default_path);
-
-  // Called on the UI thread once the DownloadManager has determined whether the
-  // suggested file path exists.
-  void OnPathExistenceAvailable(int32 download_id,
-                                const DownloadStateInfo& new_state);
-
   // Called back after a target path for the file to be downloaded to has been
   // determined, either automatically based on the suggested file name, or by
   // the user in a Save As dialog box.
   void ContinueDownloadWithPath(DownloadItem* download,
                                 const FilePath& chosen_file);
 
   // Download cancel helper function.
   void DownloadCancelledInternal(int download_id,
                                  const DownloadRequestHandle& request_handle);
 
   // All data has been downloaded.
   // |hash| is sha256 hash for the downloaded file. It is empty when the hash
   // is not available.
   void OnAllDataSaved(int32 download_id, int64 size, const std::string& hash);
 
   // An error occurred in the download.
   void OnDownloadError(int32 download_id, int64 size, int os_error);
 
   // Updates the app icon about the overall download progress.
   void UpdateAppIcon();
 
   // Inform observers that the model has changed.
   void NotifyModelChanged();
 
-  // Get the download item from the active map.  Useful when the item is not
-  // yet in the history map.
-  DownloadItem* GetActiveDownloadItem(int id);
-
   // Debugging routine to confirm relationship between below
   // containers; no-op if NDEBUG.
   void AssertContainersConsistent() const;
 
   // Add a DownloadItem to history_downloads_.
   void AddDownloadItemToHistory(DownloadItem* item, int64 db_handle);
 
   // Remove from internal maps.
   int RemoveDownloadItems(const DownloadVector& pending_deletes);
 
@@ skipping 68 matching lines @@
 
   scoped_ptr<OtherDownloadManagerObserver> other_download_manager_observer_;
 
   // Allows an embedder to control behavior. Guaranteed to outlive this object.
   DownloadManagerDelegate* delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadManager);
 };
 
 #endif  // CHROME_BROWSER_DOWNLOAD_DOWNLOAD_MANAGER_H_