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 a85588646eac1bf7c81cd56087a61af2f7a6e5d6..05f5b7b04c872e280b9004a85f345710ae91cefb 100644
--- a/chrome/browser/download/download_browsertest.cc
+++ b/chrome/browser/download/download_browsertest.cc
@@ -648,15 +648,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()));

[benjhayden, 2012/10/11 19:41:12]

While you're doing this, do you want to go ahead and merge DSI into DUP as much
as possible? It might be too complicated to delete DSI completely, but you might
be able to help some/most clients of DUP avoid using DSI at all.

[Randy Smith (Not in Mondays), 2012/10/15 18:56:32]

That's a good idea, but I'd sorta like to keep it as a separate CL.  Ok for me
to postpone?  

       params->set_callback(creation_observer->callback());
       DownloadManagerForBrowser(browser())->DownloadUrl(params.Pass());
 
@@ -1729,10 +1731,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));
@@ -1756,12 +1760,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));