Download filename determination refactor (3/3)

content/public/test/mock_download_manager.h

Index: content/public/test/mock_download_manager.h
diff --git a/content/public/test/mock_download_manager.h b/content/public/test/mock_download_manager.h
index 0f50d610bd12086bb4e0a1bd5a8309cdfef86d9c..dd009dd12022c9e040b49d64016f6d625d799e9c 100644
--- a/content/public/test/mock_download_manager.h
+++ b/content/public/test/mock_download_manager.h
@@ -17,13 +17,13 @@ void PrintTo(const DownloadRequestHandle& params, std::ostream* os);
 
 namespace content {
 
-class MockDownloadManager : public content::DownloadManager {
+class MockDownloadManager : public DownloadManager {
  public:
   MockDownloadManager();
 
   // DownloadManager:
   MOCK_METHOD1(SetDelegate, void(DownloadManagerDelegate* delegate));
-  MOCK_CONST_METHOD0(GetDelegate, content::DownloadManagerDelegate*());
+  MOCK_CONST_METHOD0(GetDelegate, DownloadManagerDelegate*());
   MOCK_METHOD0(Shutdown, void());
   MOCK_METHOD2(GetTemporaryDownloads, void(const FilePath& dir_path,
                                            DownloadVector* result));
@@ -31,16 +31,16 @@ class MockDownloadManager : public content::DownloadManager {
                                      DownloadVector* result));
   MOCK_METHOD2(SearchDownloads, void(const string16& query,
                                      DownloadVector* result));
-  MOCK_METHOD1(Init, bool(content::BrowserContext* browser_context));
+  MOCK_METHOD1(Init, bool(BrowserContext* browser_context));
 
   // Gasket for handling scoped_ptr arguments.
-  virtual content::DownloadId StartDownload(
+  virtual DownloadId StartDownload(
       scoped_ptr<DownloadCreateInfo> info,
-      scoped_ptr<content::ByteStreamReader> stream) OVERRIDE;
+      scoped_ptr<ByteStreamReader> stream) OVERRIDE;
 
   MOCK_METHOD2(MockStartDownload,
-               content::DownloadId(DownloadCreateInfo*,
-                                   content::ByteStreamReader*));
+               DownloadId(DownloadCreateInfo*,
+                          ByteStreamReader*));
   MOCK_METHOD4(UpdateDownload, void(int32 download_id,
                                     int64 bytes_so_far,
                                     int64 bytes_per_sec,
@@ -51,7 +51,7 @@ class MockDownloadManager : public content::DownloadManager {
   MOCK_METHOD1(CancelDownload, void(int32 download_id));
   MOCK_METHOD2(OnDownloadInterrupted,
                void(int32 download_id,
-                    content::DownloadInterruptReason reason));
+                    DownloadInterruptReason reason));
   MOCK_METHOD2(RemoveDownloadsBetween, int(base::Time remove_begin,
                                            base::Time remove_end));
   MOCK_METHOD1(RemoveDownloads, int(base::Time remove_begin));
@@ -67,22 +67,14 @@ class MockDownloadManager : public content::DownloadManager {
   MOCK_METHOD2(OnItemAddedToPersistentStore, void(int32 download_id,
                                                   int64 db_handle));
   MOCK_CONST_METHOD0(InProgressCount, int());
-  MOCK_CONST_METHOD0(GetBrowserContext, content::BrowserContext*());
-  MOCK_METHOD0(LastDownloadPath, FilePath());
-  MOCK_METHOD0(ClearLastDownloadPath, void());
-  MOCK_METHOD2(FileSelected, void(const FilePath& path, int32 download_id));
-  MOCK_METHOD1(FileSelectionCanceled, void(int32 download_id));
-  MOCK_METHOD1(RestartDownload, void(int32 download_id));
+  MOCK_CONST_METHOD0(GetBrowserContext, BrowserContext*());
   MOCK_METHOD0(CheckForHistoryFilesRemoval, void());
-  MOCK_METHOD1(GetDownloadItem, content::DownloadItem*(int id));
-  MOCK_METHOD1(GetDownload, content::DownloadItem*(int id));
-  MOCK_METHOD1(SavePageDownloadFinished, void(content::DownloadItem* download));
-  MOCK_METHOD1(GetActiveDownloadItem, content::DownloadItem*(int id));
+  MOCK_METHOD1(GetDownloadItem, DownloadItem*(int id));
+  MOCK_METHOD1(GetDownload, DownloadItem*(int id));
+  MOCK_METHOD1(SavePageDownloadFinished, void(DownloadItem* download));
+  MOCK_METHOD1(GetActiveDownloadItem, DownloadItem*(int id));
   MOCK_METHOD0(GenerateFileHash, bool());
-  MOCK_METHOD2(ContinueDownloadWithPath, void(content::DownloadItem* download,
-                                              const FilePath& chosen_file));
-  MOCK_METHOD1(GetActiveDownload, content::DownloadItem*(int32 download_id));
-  MOCK_METHOD1(SetFileManager, void(DownloadFileManager* file_manager));
+  MOCK_METHOD1(GetActiveDownload, DownloadItem*(int32 download_id));
 
  protected:
   virtual ~MockDownloadManager();