Shift passage of FileStream in downloads system to be by scoped_ptr<>.

chrome/browser/download/download_browsertest.cc

Index: chrome/browser/download/download_browsertest.cc
diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc
index 63904590ccdb0380970bf86fed24226491a919b5..e4652c44c7b5f376909ff6d00ea44999a35d1188 100644
--- a/chrome/browser/download/download_browsertest.cc
+++ b/chrome/browser/download/download_browsertest.cc
@@ -204,9 +204,7 @@ bool WasAutoOpened(DownloadItem* item) {
 }
 
 // Called when a download starts. Marks the download as hidden.
-void SetHiddenDownloadCallback(scoped_refptr<DownloadManager> download_manager,
-                               DownloadItem* item,
-                               net::Error error) {
+void SetHiddenDownloadCallback(DownloadItem* item, net::Error error) {
   download_util::SetShouldShowInShelf(item, false);
 }
 
@@ -655,15 +653,17 @@ class DownloadTest : public InProcessBrowserTest {
 
     if (download_info.download_method == DOWNLOAD_DIRECT) {
       // Go directly to download.  Don't wait for navigation.
-      content::DownloadSaveInfo save_info;
+      scoped_ptr<content::DownloadSaveInfo> save_info(
+          new content::DownloadSaveInfo());
       // NOTE: |prompt_for_save_location| may change during the download.
-      save_info.prompt_for_save_location = false;
+      save_info->prompt_for_save_location = false;
 
       scoped_refptr<content::DownloadTestItemCreationObserver>
           creation_observer(new content::DownloadTestItemCreationObserver);
 
       scoped_ptr<DownloadUrlParameters> params(
-          DownloadUrlParameters::FromWebContents(web_contents, url, save_info));
+          DownloadUrlParameters::FromWebContents(
+              web_contents, url, save_info.Pass()));
       params->set_callback(creation_observer->callback());
       DownloadManagerForBrowser(browser())->DownloadUrl(params.Pass());
 
@@ -1732,10 +1732,12 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadUrl) {
       new content::DownloadTestObserverTerminal(
           DownloadManagerForBrowser(browser()), 1,
           content::DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_FAIL));
-  content::DownloadSaveInfo save_info;
-  save_info.prompt_for_save_location = true;
+  scoped_ptr<content::DownloadSaveInfo> save_info(
+      new content::DownloadSaveInfo());
+  save_info->prompt_for_save_location = true;
   scoped_ptr<DownloadUrlParameters> params(
-      DownloadUrlParameters::FromWebContents(web_contents, url, save_info));
+      DownloadUrlParameters::FromWebContents(
+          web_contents, url, save_info.Pass()));
   DownloadManagerForBrowser(browser())->DownloadUrl(params.Pass());
   observer->WaitForFinished();
   EXPECT_EQ(1u, observer->NumDownloadsSeenInState(DownloadItem::COMPLETE));
@@ -1759,12 +1761,14 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadUrlToPath) {
   ASSERT_TRUE(other_directory.CreateUniqueTempDir());
   FilePath target_file_full_path
       = other_directory.path().Append(file.BaseName());
-  content::DownloadSaveInfo save_info;
-  save_info.file_path = target_file_full_path;
+  scoped_ptr<content::DownloadSaveInfo> save_info(
+      new content::DownloadSaveInfo());
+  save_info->file_path = target_file_full_path;
 
   content::DownloadTestObserver* observer(CreateWaiter(browser(), 1));
   scoped_ptr<DownloadUrlParameters> params(
-      DownloadUrlParameters::FromWebContents(web_contents, url, save_info));
+      DownloadUrlParameters::FromWebContents(
+          web_contents, url, save_info.Pass()));
   DownloadManagerForBrowser(browser())->DownloadUrl(params.Pass());
   observer->WaitForFinished();
   EXPECT_EQ(1u, observer->NumDownloadsSeenInState(DownloadItem::COMPLETE));
@@ -2259,15 +2263,16 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, HiddenDownload) {
           download_manager,
           1,
           content::DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_FAIL));
-  content::DownloadSaveInfo save_info;
-  save_info.prompt_for_save_location = false;
+  scoped_ptr<content::DownloadSaveInfo> save_info(
+      new content::DownloadSaveInfo());
+  save_info->prompt_for_save_location = false;
 
   // Download and set IsHiddenDownload to true.
   WebContents* web_contents = chrome::GetActiveWebContents(browser());
   scoped_ptr<DownloadUrlParameters> params(
-      DownloadUrlParameters::FromWebContents(web_contents, url, save_info));
-  params->set_callback(
-      base::Bind(&SetHiddenDownloadCallback, download_manager));
+      DownloadUrlParameters::FromWebContents(
+          web_contents, url, save_info.Pass()));
+  params->set_callback(base::Bind(&SetHiddenDownloadCallback));
   download_manager->DownloadUrl(params.Pass());
   observer->WaitForFinished();