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

content/browser/download/download_resource_handler.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_resource_handler.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 64 matching lines @@
 
   if (!started_cb.is_null())
     started_cb.Run(download_id, net::OK);
 }
 
 }  // namespace
 
 DownloadResourceHandler::DownloadResourceHandler(
     net::URLRequest* request,
     const DownloadResourceHandler::OnStartedCallback& started_cb,
-    const content::DownloadSaveInfo& save_info)
+    scoped_ptr<content::DownloadSaveInfo> save_info)
     : render_view_id_(0),               // Actually initialized below.
       content_length_(0),
       request_(request),
       started_cb_(started_cb),
-      save_info_(save_info),
+      save_info_(save_info.Pass()),
       last_buffer_size_(0),
       bytes_read_(0),
       pause_count_(0),
       was_deferred_(false),
       on_response_started_called_(false) {
   ResourceRequestInfoImpl* info(ResourceRequestInfoImpl::ForRequest(request));
   global_id_ = info->GetGlobalRequestID();
   render_view_id_ = info->GetRouteID();
 
   download_stats::RecordDownloadCount(download_stats::UNTHROTTLED_COUNT);
@@ skipping 51 matching lines @@
   CreateByteStream(
       base::MessageLoopProxy::current(),
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE),
       kDownloadByteStreamSize, &stream_writer_, &stream_reader);
   stream_writer_->RegisterCallback(
       base::Bind(&DownloadResourceHandler::ResumeRequest, AsWeakPtr()));
 
   info->url_chain = request_->url_chain();
   info->referrer_url = GURL(request_->referrer());
   info->start_time = base::Time::Now();
-  info->received_bytes = save_info_.offset;
+  info->received_bytes = save_info_->offset;
   info->total_bytes = content_length_;
   info->state = DownloadItem::IN_PROGRESS;
   info->has_user_gesture = request_info->HasUserGesture();
   info->content_disposition = content_disposition_;
   info->mime_type = response->head.mime_type;
   info->remote_address = request_->GetSocketAddress().host();
   download_stats::RecordDownloadMimeType(info->mime_type);
 
   info->request_handle =
       DownloadRequestHandle(AsWeakPtr(), global_id_.child_id,
@@ skipping 16 matching lines @@
     content_type_header = "";
   info->original_mime_type = content_type_header;
 
   if (!response->head.headers ||
       !response->head.headers->EnumerateHeader(
           NULL, "Accept-Ranges", &accept_ranges_)) {
     accept_ranges_ = "";
   }
 
   info->prompt_user_for_save_location =
-      save_info_.prompt_for_save_location && save_info_.file_path.empty();
+      save_info_->prompt_for_save_location && save_info_->file_path.empty();
   info->referrer_charset = request_->context()->referrer_charset();
-  info->save_info = save_info_;
+  info->save_info = save_info_.Pass();
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&StartOnUIThread,
                  base::Passed(info.Pass()),
                  base::Passed(stream_reader.Pass()),
                  // Pass to StartOnUIThread so that variable
                  // access is always on IO thread but function
                  // is called on UI thread.
                  started_cb_));
@@ skipping 209 matching lines @@
 }
 
 std::string DownloadResourceHandler::DebugString() const {
   return base::StringPrintf("{"
                             " url_ = " "\"%s\""
                             " global_id_ = {"
                             " child_id = " "%d"
                             " request_id = " "%d"
                             " }"
                             " render_view_id_ = " "%d"
-                            " save_info_.file_path = \"%" PRFilePath "\""
                             " }",
                             request_ ?
                                 request_->url().spec().c_str() :
                                 "<NULL request>",
                             global_id_.child_id,
                             global_id_.request_id,
-                            render_view_id_,
-                            save_info_.file_path.value().c_str());
+                            render_view_id_);
 }
 
 DownloadResourceHandler::~DownloadResourceHandler() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   // This won't do anything if the callback was called before.
   // If it goes through, it will likely be because OnWillStart() returned
   // false somewhere in the chain of resource handlers.
   CallStartedCB(DownloadId(), net::ERR_ACCESS_DENIED);
 
   // Remove output stream callback if a stream exists.
   if (stream_writer_.get())
     stream_writer_->RegisterCallback(base::Closure());
 
   UMA_HISTOGRAM_TIMES("SB2.DownloadDuration",
                       base::TimeTicks::Now() - download_start_time_);
 }