WIP - Refactor programmatic downloads

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 fdcf9d67485eaead0c68ad02a82d830021cee6bc..485f4617ef2298c8d6cce77eafa4e49ded87d2f7 100644
--- a/content/public/test/mock_download_manager.h
+++ b/content/public/test/mock_download_manager.h
@@ -76,15 +76,14 @@ class MockDownloadManager : public DownloadManager {
   MOCK_METHOD1(Init, bool(BrowserContext* browser_context));
 
   // Gasket for handling scoped_ptr arguments.
-  virtual void StartDownload(
-      scoped_ptr<DownloadCreateInfo> info,
-      scoped_ptr<ByteStreamReader> stream,
-      const DownloadUrlParameters::OnStartedCallback& callback) OVERRIDE;
+  virtual void StartDownloadWithActiveRequest(
+      scoped_ptr<DownloadRequestHandle> request_handle,
+      scoped_ptr<DownloadCreateInfo> info) OVERRIDE;
 
   MOCK_METHOD2(MockStartDownload,
-               void(DownloadCreateInfo*, ByteStreamReader*));
-  MOCK_METHOD2(RemoveDownloadsBetween, int(base::Time remove_begin,
-                                           base::Time remove_end));
+               void(DownloadRequestHandle*, DownloadCreateInfo*));
+  MOCK_METHOD2(RemoveDownloadsBetween,
+               int(base::Time remove_begin, base::Time remove_end));
   MOCK_METHOD1(RemoveDownloads, int(base::Time remove_begin));
   MOCK_METHOD0(RemoveAllDownloads, int());
   MOCK_METHOD1(DownloadUrlMock, void(DownloadUrlParameters*));