Index: chrome/browser/download/chrome_download_manager_delegate.h |
diff --git a/chrome/browser/download/chrome_download_manager_delegate.h b/chrome/browser/download/chrome_download_manager_delegate.h |
index 7d738e524a68318670abb28af0645d699fb1c293..31d80617fca0a1483c746ae97466ea1709ecdba5 100644 |
--- a/chrome/browser/download/chrome_download_manager_delegate.h |
+++ b/chrome/browser/download/chrome_download_manager_delegate.h |
@@ -8,9 +8,12 @@ |
#include <stdint.h> |
#include <memory> |
+#include <string> |
+#include <vector> |
#include "base/compiler_specific.h" |
#include "base/containers/hash_tables.h" |
+#include "base/gtest_prod_util.h" |
#include "base/macros.h" |
#include "base/memory/weak_ptr.h" |
#include "chrome/browser/download/download_path_reservation_tracker.h" |
@@ -96,10 +99,6 @@ class ChromeDownloadManagerDelegate |
DownloadPrefs* download_prefs() { return download_prefs_.get(); } |
protected: |
- // So that test classes that inherit from this for override purposes |
- // can call back into the DownloadManager. |
- content::DownloadManager* download_manager_; |
- |
virtual safe_browsing::DownloadProtectionService* |
GetDownloadProtectionService(); |
@@ -113,9 +112,10 @@ class ChromeDownloadManagerDelegate |
bool create_directory, |
DownloadPathReservationTracker::FilenameConflictAction conflict_action, |
const ReservedPathCallback& callback) override; |
- void PromptUserForDownloadPath(content::DownloadItem* download, |
- const base::FilePath& suggested_virtual_path, |
- const FileSelectedCallback& callback) override; |
+ void RequestConfirmation(content::DownloadItem* download, |
+ const base::FilePath& suggested_virtual_path, |
+ DownloadConfirmationReason reason, |
+ const FileSelectedCallback& callback) override; |
void DetermineLocalPath(content::DownloadItem* download, |
const base::FilePath& virtual_path, |
const LocalPathCallback& callback) override; |
@@ -125,8 +125,14 @@ class ChromeDownloadManagerDelegate |
void GetFileMimeType(const base::FilePath& path, |
const GetFileMimeTypeCallback& callback) override; |
+ // So that test classes that inherit from this for override purposes |
+ // can call back into the DownloadManager. |
+ content::DownloadManager* download_manager_; |
+ |
private: |
friend class base::RefCountedThreadSafe<ChromeDownloadManagerDelegate>; |
+ FRIEND_TEST_ALL_PREFIXES(ChromeDownloadManagerDelegateTest, |
+ RequestConfirmation_Android); |
typedef std::vector<content::DownloadIdCallback> IdCallbackVector; |