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

content/browser/download/download_manager_impl.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/download_manager_impl.h"
 
 #include <iterator>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 57 matching lines @@
   virtual ~SavePageData() {}
 
  private:
   static const char kKey[];
 
   DISALLOW_COPY_AND_ASSIGN(SavePageData);
 };
 
 const char SavePageData::kKey[] = "DownloadItem SavePageData";
 
-void BeginDownload(content::DownloadUrlParameters* params) {
+void BeginDownload(scoped_ptr<content::DownloadUrlParameters> params) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   // ResourceDispatcherHost{Base} is-not-a URLRequest::Delegate, and
   // DownloadUrlParameters can-not include resource_dispatcher_host_impl.h, so
   // we must down cast. RDHI is the only subclass of RDH as of 2012 May 4.
   scoped_ptr<net::URLRequest> request(
       params->resource_context()->GetRequestContext()->CreateRequest(
           params->url(), NULL));
   request->set_referrer(params->referrer().url.spec());
   webkit_glue::ConfigureURLRequestForReferrerPolicy(
       request.get(), params->referrer().policy);
@@ skipping 20 matching lines @@
     request->SetExtraRequestHeaderByName(
         iter->first, iter->second, false/*overwrite*/);
   }
   params->resource_dispatcher_host()->BeginDownload(
       request.Pass(),
       params->content_initiated(),
       params->resource_context(),
       params->render_process_host_id(),
       params->render_view_host_routing_id(),
       params->prefer_cache(),
-      params->save_info(),
+      params->GetSaveInfo(),            // Nulls params internal copy.

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

This comment belongs in d_u_p.h, not here. |params| is a scoped_ptr here, so its
days (cpu cycles?) are numbered anyway.

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

Ok, but it is already there, and that behavior might be (is) strange from the
callers perspective.  But Done.  (The obvious fix for this is to merge
DownloadSaveInfo into DUP as you suggested).

       params->callback());
 }
 
 class MapValueIteratorAdapter {
  public:
   explicit MapValueIteratorAdapter(
       base::hash_map<int64, DownloadItem*>::const_iterator iter)
     : iter_(iter) {
   }
   ~MapValueIteratorAdapter() {}
@@ skipping 655 matching lines @@
 }
 
 void DownloadManagerImpl::DownloadUrl(
     scoped_ptr<content::DownloadUrlParameters> params) {
   if (params->post_id() >= 0) {
     // Check this here so that the traceback is more useful.
     DCHECK(params->prefer_cache());
     DCHECK(params->method() == "POST");
   }
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, base::Bind(
-      &BeginDownload, base::Owned(params.release())));
+      &BeginDownload, base::Passed(params.Pass())));
 }
 
 void DownloadManagerImpl::AddObserver(Observer* observer) {
   observers_.AddObserver(observer);
   // TODO: It is the responsibility of the observers to query the
   // DownloadManager. Remove the following call from here and update all
   // observers.
   observer->ModelChanged(this);
 }
 
@@ skipping 233 matching lines @@
 void DownloadManagerImpl::DownloadRenamedToFinalName(
     DownloadItemImpl* download) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   // If the rename failed, we receive an OnDownloadInterrupted() call before we
   // receive the DownloadRenamedToFinalName() call.
   if (delegate_) {
     delegate_->UpdatePathForItemInPersistentStore(
         download, download->GetFullPath());
   }
 }