Replace void* with int32 for passing download_id to SelectFileDialog::Listener.

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 342 matching lines @@
 
   VLOG(20) << __FUNCTION__ << "()"
            << " download = " << download->DebugString(true);
 
   FilePath suggested_path = download->GetSuggestedPath();
 
   if (download->PromptUserForSaveLocation()) {
     // We must ask the user for the place to put the download.
     WebContents* contents = download->GetWebContents();
 
-    // |id_ptr| will be deleted in either FileSelected() or
-    // FileSelectionCancelled().
-    int32* id_ptr = new int32;
-    *id_ptr = download_id;
     FilePath target_path;
     // If |download| is a potentially dangerous file, then |suggested_path|
     // contains the intermediate name instead of the final download
     // filename. The latter is GetTargetName().
     if (download->GetDangerType() !=
             content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS)
       target_path = suggested_path.DirName().Append(download->GetTargetName());
     else
       target_path = suggested_path;
 
     delegate_->ChooseDownloadPath(contents, target_path,
-                                  reinterpret_cast<void*>(id_ptr));
+                                  download_id);
     FOR_EACH_OBSERVER(Observer, observers_,
                       SelectFileDialogDisplayed(this, download_id));
   } else {
     // No prompting for download, just continue with the suggested name.
     ContinueDownloadWithPath(download, suggested_path);
   }
 }
 
 content::BrowserContext* DownloadManagerImpl::GetBrowserContext() const {
   return browser_context_;
@@ skipping 466 matching lines @@
   // 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);
 }
 
 void DownloadManagerImpl::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
-void DownloadManagerImpl::FileSelected(const FilePath& path, void* params) {
+void DownloadManagerImpl::FileSelected(const FilePath& path,
+                                       int32 download_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  int32* id_ptr = reinterpret_cast<int32*>(params);
-  DCHECK(id_ptr != NULL);
-  int32 download_id = *id_ptr;
-  delete id_ptr;
-
   DownloadItem* download = GetActiveDownloadItem(download_id);
   if (!download)
     return;
   VLOG(20) << __FUNCTION__ << "()" << " path = \"" << path.value() << "\""
             << " download = " << download->DebugString(true);
 
   if (download->PromptUserForSaveLocation())
     last_download_path_ = path.DirName();
 
   // Make sure the initial file name is set only once.
   ContinueDownloadWithPath(download, path);
 }
 
-void DownloadManagerImpl::FileSelectionCanceled(void* params) {
+void DownloadManagerImpl::FileSelectionCanceled(int32 download_id) {
   // The user didn't pick a place to save the file, so need to cancel the
   // download that's already in progress to the temporary location.
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  int32* id_ptr = reinterpret_cast<int32*>(params);
-  DCHECK(id_ptr != NULL);
-  int32 download_id = *id_ptr;
-  delete id_ptr;
 
   DownloadItem* download = GetActiveDownloadItem(download_id);
   if (!download)
     return;
 
   VLOG(20) << __FUNCTION__ << "()"
            << " download = " << download->DebugString(true);
 
   download->Cancel(true);
 }
@@ skipping 267 matching lines @@
        it != history_downloads_.end(); ++it) {
     if (it->second->IsComplete() && !it->second->GetOpened())
       ++num_unopened;
   }
   download_stats::RecordOpensOutstanding(num_unopened);
 }
 
 void DownloadManagerImpl::SetFileManager(DownloadFileManager* file_manager) {
   file_manager_ = file_manager;
 }