Make DownloadHistory observe manager, items

chrome/browser/download/chrome_download_manager_delegate.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_DOWNLOAD_CHROME_DOWNLOAD_MANAGER_DELEGATE_H_
 #define CHROME_BROWSER_DOWNLOAD_CHROME_DOWNLOAD_MANAGER_DELEGATE_H_
 
 #include "base/compiler_specific.h"
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
+#include "chrome/browser/download/download_history.h"
+#include "chrome/browser/download/download_path_reservation_tracker.h"
 #include "chrome/browser/safe_browsing/download_protection_service.h"
-#include "chrome/browser/download/download_path_reservation_tracker.h"
 #include "content/public/browser/download_danger_type.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/download_manager_delegate.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 class DownloadHistory;
 class DownloadPrefs;
 class ExtensionDownloadsEventRouter;
 class Profile;
@@ skipping 25 matching lines @@
  public:
   // Callback type used with ChooseDownloadPath(). The callback should be
   // invoked with the user-selected path as the argument. If the file selection
   // was canceled, the argument should be the empty path.
   typedef base::Callback<void(const FilePath&)> FileSelectedCallback;
 
   explicit ChromeDownloadManagerDelegate(Profile* profile);
 
   void SetDownloadManager(content::DownloadManager* dm);
 
-  // Should be called before the call to ShouldCompleteDownload() to
+  // Add/Remove Observers of DownloadHistory events.
+  void AddHistoryObserver(DownloadHistory::Observer* observer);
+  void RemoveHistoryObserver(DownloadHistory::Observer* observer);

[Randy Smith (Not in Mondays), 2012/11/02 23:31:25]

These appear to only be used by tests.  Any reason not to give tests some way to
get at the DownloadHistory object instead?  Or at least make these "ForTesting"?

[benjhayden, 2012/11/06 20:01:14]

Exposed DownloadService::GetDownloadHistory(). LMK if you think I should also
make DownloadHistory::Add/RemoveObserver "ForTesting".

[Randy Smith (Not in Mondays), 2012/11/07 21:10:29]

Nope, I think that'll do it--you correctly divined that the weirdness of having
the Add/Remove interfaces on CDMD was what was making me ootsy.

[benjhayden, 2012/11/08 18:57:03]

Done.

+
+  // Should be called before the first call to ShouldCompleteDownload() to
   // disable SafeBrowsing checks for |item|.
   static void DisableSafeBrowsing(content::DownloadItem* item);
 
   // content::DownloadManagerDelegate
   virtual void Shutdown() OVERRIDE;
   virtual content::DownloadId GetNextId() OVERRIDE;
   virtual bool DetermineDownloadTarget(
       content::DownloadItem* item,
       const content::DownloadTargetCallback& callback) OVERRIDE;
   virtual content::WebContents*
       GetAlternativeWebContentsToNotifyForDownload() OVERRIDE;
   virtual bool ShouldOpenFileBasedOnExtension(const FilePath& path) OVERRIDE;
   virtual bool ShouldCompleteDownload(
       content::DownloadItem* item,
       const base::Closure& complete_callback) OVERRIDE;
   virtual bool ShouldOpenDownload(content::DownloadItem* item) OVERRIDE;
   virtual bool GenerateFileHash() OVERRIDE;
-  virtual void AddItemToPersistentStore(content::DownloadItem* item) OVERRIDE;
-  virtual void UpdateItemInPersistentStore(
-      content::DownloadItem* item) OVERRIDE;
-  virtual void UpdatePathForItemInPersistentStore(
-      content::DownloadItem* item,
-      const FilePath& new_path) OVERRIDE;
-  virtual void RemoveItemFromPersistentStore(
-      content::DownloadItem* item) OVERRIDE;
-  virtual void RemoveItemsFromPersistentStoreBetween(
-      base::Time remove_begin,
-      base::Time remove_end) OVERRIDE;
   virtual void GetSaveDir(content::BrowserContext* browser_context,
                           FilePath* website_save_dir,
                           FilePath* download_save_dir,
                           bool* skip_dir_check) OVERRIDE;
   virtual void ChooseSavePath(
       content::WebContents* web_contents,
       const FilePath& suggested_path,
       const FilePath::StringType& default_extension,
       bool can_save_as_complete,
       const content::SavePackagePathPickedCallback& callback) OVERRIDE;
 
   // Clears the last directory chosen by the user in response to a file chooser
   // prompt. Called when clearing recent history.
   void ClearLastDownloadPath();
 
   DownloadPrefs* download_prefs() { return download_prefs_.get(); }
-  DownloadHistory* download_history() { return download_history_.get(); }
 
  protected:
   // So that test classes can inherit from this for override purposes.
   virtual ~ChromeDownloadManagerDelegate();
 
   // Returns the SafeBrowsing download protection service if it's
   // enabled. Returns NULL otherwise. Protected virtual for testing.
   virtual safe_browsing::DownloadProtectionService*
      GetDownloadProtectionService();
 
@@ skipping 90 matching lines @@
       bool reserved_path_verified);
 
   // Called on the UI thread once the final target path is available.
   void OnTargetPathDetermined(
       int32 download_id,
       const content::DownloadTargetCallback& callback,
       content::DownloadItem::TargetDisposition disposition,
       content::DownloadDangerType danger_type,
       const FilePath& target_path);
 
-  // Callback from history system.
-  void OnItemAddedToPersistentStore(int32 download_id, int64 db_handle);
-
   // Check policy of whether we should open this download with a web intents
   // dispatch.
   bool ShouldOpenWithWebIntents(const content::DownloadItem* item);
 
   // Open the given item with a web intent dispatch.
   void OpenWithWebIntent(const content::DownloadItem* item);
 
   // Internal gateways for ShouldCompleteDownload().
   bool IsDownloadReadyForCompletion(
       content::DownloadItem* item,
@@ skipping 28 matching lines @@
 #endif
 
   // The directory most recently chosen by the user in response to a Save As
   // dialog for a regular download.
   FilePath last_download_path_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeDownloadManagerDelegate);
 };
 
 #endif  // CHROME_BROWSER_DOWNLOAD_CHROME_DOWNLOAD_MANAGER_DELEGATE_H_