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

content/browser/download/drag_download_file.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/download/drag_download_file.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "content/browser/download/download_stats.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/download_save_info.h"
 #include "content/public/browser/download_url_parameters.h"
 #include "net/base/file_stream.h"
 
 using content::BrowserContext;
 using content::BrowserThread;
 using content::DownloadItem;
 using content::DownloadManager;
 using content::DownloadUrlParameters;
 using content::WebContents;
 
 DragDownloadFile::DragDownloadFile(
     const FilePath& file_name_or_path,
-    linked_ptr<net::FileStream> file_stream,
+    scoped_ptr<net::FileStream> file_stream,
     const GURL& url,
     const content::Referrer& referrer,
     const std::string& referrer_encoding,
     WebContents* web_contents)
-    : file_stream_(file_stream),
+    : file_stream_(file_stream.Pass()),
       url_(url),
       referrer_(referrer),
       referrer_encoding_(referrer_encoding),
       web_contents_(web_contents),
       drag_message_loop_(MessageLoop::current()),
       is_started_(false),
       is_successful_(false),
 #if defined(OS_WIN)
       is_running_nested_message_loop_(false),
 #endif
@@ skipping 82 matching lines @@
         base::Bind(&DragDownloadFile::InitiateDownload, this));
     return;
   }
 #endif
 
   download_manager_ = BrowserContext::GetDownloadManager(
       web_contents_->GetBrowserContext());
   download_manager_observer_added_ = true;
   download_manager_->AddObserver(this);
 
-  content::DownloadSaveInfo save_info;
-  save_info.file_path = file_path_;
-  save_info.file_stream = file_stream_;
+  scoped_ptr<content::DownloadSaveInfo> save_info;
+  save_info->file_path = file_path_;
+  save_info->file_stream = file_stream_.Pass(); // Nulls file_stream_
 
   download_stats::RecordDownloadSource(
       download_stats::INITIATED_BY_DRAG_N_DROP);
   scoped_ptr<DownloadUrlParameters> params(
-      DownloadUrlParameters::FromWebContents(web_contents_, url_, save_info));
+      DownloadUrlParameters::FromWebContents(
+          web_contents_, url_, save_info.Pass()));
   params->set_referrer(referrer_);
   params->set_referrer_encoding(referrer_encoding_);
   download_manager_->DownloadUrl(params.Pass());
 }
 
 void DragDownloadFile::DownloadCompleted(bool is_successful) {
 #if defined(OS_WIN)
   // If not in drag-and-drop thread, defer the running to it.
   if (drag_message_loop_ != MessageLoop::current()) {
     drag_message_loop_->PostTask(
@@ skipping 92 matching lines @@
 
 void DragDownloadFile::QuitNestedMessageLoop() {
   AssertCurrentlyOnDragThread();
 
   if (is_running_nested_message_loop_) {
     is_running_nested_message_loop_ = false;
     MessageLoop::current()->Quit();
   }
 }
 #endif