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

content/browser/download/download_browsertest.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.
 
 // This file contains download browser tests that are known to be runnable
 // in a pure content context.  Over time tests should be migrated here.
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/scoped_temp_dir.h"
@@ skipping 57 matching lines @@
   // We're in a content_browsertest; we know that the DownloadManager
   // is a DownloadManagerImpl.
   return static_cast<DownloadManagerImpl*>(
       BrowserContext::GetDownloadManager(
           shell->web_contents()->GetBrowserContext()));
 }
 
 class DownloadFileWithDelay : public DownloadFileImpl {
  public:
   DownloadFileWithDelay(
-      const DownloadCreateInfo* info,
+      scoped_ptr<DownloadCreateInfo> info,
       scoped_ptr<content::ByteStreamReader> stream,
       DownloadRequestHandleInterface* request_handle,
       scoped_refptr<content::DownloadManager> download_manager,
       bool calculate_hash,
       scoped_ptr<content::PowerSaveBlocker> power_save_blocker,
       const net::BoundNetLog& bound_net_log,
       // |owner| is required to outlive the DownloadFileWithDelay.
       DownloadFileWithDelayFactory* owner);
 
   virtual ~DownloadFileWithDelay();
@@ skipping 27 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(DownloadFileWithDelay);
 };
 
 class DownloadFileWithDelayFactory : public DownloadFileFactory {
  public:
   DownloadFileWithDelayFactory();
   virtual ~DownloadFileWithDelayFactory();
 
   // DownloadFileFactory interface.
   virtual content::DownloadFile* CreateFile(
-      DownloadCreateInfo* info,
+      scoped_ptr<DownloadCreateInfo> info,
       scoped_ptr<content::ByteStreamReader> stream,
       DownloadManager* download_manager,
       bool calculate_hash,
       const net::BoundNetLog& bound_net_log) OVERRIDE;
 
   // Must all be called on the UI thread.
   void AddRenameCallback(base::Closure callback);
   void AddDetachCallback(base::Closure callback);
   void GetAllRenameCallbacks(std::vector<base::Closure>* results);
   void GetAllDetachCallbacks(std::vector<base::Closure>* results);
 
   // Do not return until either GetAllRenameCallbacks() or
   // GetAllDetachCallbacks() will return a non-empty list.
   void WaitForSomeCallback();
 
  private:
   std::vector<base::Closure> rename_callbacks_;
   std::vector<base::Closure> detach_callbacks_;
   bool waiting_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadFileWithDelayFactory);
 };
 
 DownloadFileWithDelay::DownloadFileWithDelay(
-      const DownloadCreateInfo* info,
-      scoped_ptr<content::ByteStreamReader> stream,
-      DownloadRequestHandleInterface* request_handle,
-      scoped_refptr<content::DownloadManager> download_manager,
-      bool calculate_hash,
-      scoped_ptr<content::PowerSaveBlocker> power_save_blocker,
-      const net::BoundNetLog& bound_net_log,
-      DownloadFileWithDelayFactory* owner)
-    : DownloadFileImpl(info, stream.Pass(), request_handle, download_manager,
-                       calculate_hash, power_save_blocker.Pass(),
-                       bound_net_log),
+    scoped_ptr<DownloadCreateInfo> info,
+    scoped_ptr<content::ByteStreamReader> stream,
+    DownloadRequestHandleInterface* request_handle,
+    scoped_refptr<content::DownloadManager> download_manager,
+    bool calculate_hash,
+    scoped_ptr<content::PowerSaveBlocker> power_save_blocker,
+    const net::BoundNetLog& bound_net_log,
+    DownloadFileWithDelayFactory* owner)
+    : DownloadFileImpl(info.Pass(), stream.Pass(), request_handle,
+                       download_manager, calculate_hash,
+                       power_save_blocker.Pass(), bound_net_log),
       owner_(owner) {}
 
 DownloadFileWithDelay::~DownloadFileWithDelay() {}
 
 void DownloadFileWithDelay::Rename(const FilePath& full_path,
                       bool overwrite_existing_file,
                       const RenameCompletionCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   DownloadFileImpl::Rename(
       full_path, overwrite_existing_file,
@@ skipping 24 matching lines @@
     const base::Closure& original_callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   factory->AddDetachCallback(original_callback);
 }
 
 DownloadFileWithDelayFactory::DownloadFileWithDelayFactory()
     : waiting_(false) {}
 DownloadFileWithDelayFactory::~DownloadFileWithDelayFactory() {}
 
 DownloadFile* DownloadFileWithDelayFactory::CreateFile(
-    DownloadCreateInfo* info,
+    scoped_ptr<DownloadCreateInfo> info,
     scoped_ptr<content::ByteStreamReader> stream,
     DownloadManager* download_manager,
     bool calculate_hash,
     const net::BoundNetLog& bound_net_log) {
+  // Ownership will be taken by DownloadFileWithDelay.
+  DownloadRequestHandle* request_handle(
+      new DownloadRequestHandle(info->request_handle));
+
   return new DownloadFileWithDelay(
-      info, stream.Pass(), new DownloadRequestHandle(info->request_handle),
-      download_manager, calculate_hash,
+      info.Pass(), stream.Pass(), request_handle, download_manager,
+      calculate_hash,
       scoped_ptr<content::PowerSaveBlocker>(
           new content::PowerSaveBlocker(
               content::PowerSaveBlocker::kPowerSaveBlockPreventAppSuspension,
               "Download in progress")).Pass(),
       bound_net_log, this);
 }
 
 void DownloadFileWithDelayFactory::AddRenameCallback(base::Closure callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   rename_callbacks_.push_back(callback);
@@ skipping 30 matching lines @@
   }
 }
 
 bool WasPersisted(DownloadItem* item) {
   return item->IsPersisted();
 }
 
 class CountingDownloadFile : public DownloadFileImpl {
  public:
   CountingDownloadFile(
-      const DownloadCreateInfo* info,
+      scoped_ptr<DownloadCreateInfo> info,
       scoped_ptr<content::ByteStreamReader> stream,
       DownloadRequestHandleInterface* request_handle,
       scoped_refptr<content::DownloadManager> download_manager,
       bool calculate_hash,
       scoped_ptr<content::PowerSaveBlocker> power_save_blocker,
       const net::BoundNetLog& bound_net_log)
-      : DownloadFileImpl(info, stream.Pass(), request_handle, download_manager,
-                         calculate_hash, power_save_blocker.Pass(),
-                         bound_net_log) {}
+      : DownloadFileImpl(info.Pass(), stream.Pass(), request_handle,
+                         download_manager, calculate_hash,
+                         power_save_blocker.Pass(), bound_net_log) {}
 
   virtual ~CountingDownloadFile() {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
     active_files_--;
   }
 
   virtual content::DownloadInterruptReason Initialize() OVERRIDE {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
     active_files_++;
     return DownloadFileImpl::Initialize();
@@ skipping 22 matching lines @@
 
 int CountingDownloadFile::active_files_ = 0;
 
 class CountingDownloadFileFactory : public DownloadFileFactory {
  public:
   CountingDownloadFileFactory() {}
   virtual ~CountingDownloadFileFactory() {}
 
   // DownloadFileFactory interface.
   virtual content::DownloadFile* CreateFile(
-      DownloadCreateInfo* info,
+      scoped_ptr<DownloadCreateInfo> info,
       scoped_ptr<content::ByteStreamReader> stream,
       DownloadManager* download_manager,
       bool calculate_hash,
       const net::BoundNetLog& bound_net_log) OVERRIDE {
+    DownloadRequestHandle* request_handle(
+        new DownloadRequestHandle(info->request_handle));
+
     return new CountingDownloadFile(
-        info, stream.Pass(), new DownloadRequestHandle(info->request_handle),
+        info.Pass(), stream.Pass(),
+        request_handle,                 // CountingDownloadFile takes ownership
         download_manager, calculate_hash,
         scoped_ptr<content::PowerSaveBlocker>(
             new content::PowerSaveBlocker(
                 content::PowerSaveBlocker::kPowerSaveBlockPreventAppSuspension,
                 "Download in progress")).Pass(),
         bound_net_log);
   }
 };
 
 }  // namespace
@@ skipping 408 matching lines @@
   // Shutdown the download manager.  Mostly this is confirming a lack of
   // crashes.
   DownloadManagerForShell(shell())->Shutdown();
 
   // Run the detach callback; shouldn't cause any problems.
   callbacks[0].Run();
   callbacks.clear();
 }
 
 }  // namespace content