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

BUG=NONE
TEST=trybot runs.

Review URL: http://codereview.chromium.org/9589003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124851 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/download/chrome_download_manager_delegate.cc

@@ -136,10 +136,10 @@ bool ChromeDownloadManagerDelegate::ShouldStartDownload(int32 download_id) {
 void ChromeDownloadManagerDelegate::ChooseDownloadPath(
     WebContents* web_contents,
     const FilePath& suggested_path,
-    void* data) {
+    int32 download_id) {
   // Deletes itself.
   new DownloadFilePicker(
-      download_manager_, web_contents, suggested_path, data);
+      download_manager_, web_contents, suggested_path, download_id);
 }
 
 FilePath ChromeDownloadManagerDelegate::GetIntermediatePath(

chrome/browser/download/chrome_download_manager_delegate.h

@@ -56,7 +56,7 @@ class ChromeDownloadManagerDelegate
   virtual bool ShouldStartDownload(int32 download_id) OVERRIDE;
   virtual void ChooseDownloadPath(content::WebContents* web_contents,
                                   const FilePath& suggested_path,
-                                  void* data) OVERRIDE;
+                                  int32 download_id) OVERRIDE;
   virtual FilePath GetIntermediatePath(const FilePath& suggested_path) OVERRIDE;
   virtual content::WebContents*
       GetAlternativeWebContentsToNotifyForDownload() OVERRIDE;

chrome/browser/download/download_browsertest.cc

@@ -138,9 +138,9 @@ class PickSuggestedFileDelegate : public ChromeDownloadManagerDelegate {
 
   virtual void ChooseDownloadPath(WebContents* web_contents,
                                   const FilePath& suggested_path,
-                                  void* data) OVERRIDE {
+                                  int32 download_id) OVERRIDE {
     if (download_manager_)
-      download_manager_->FileSelected(suggested_path, data);
+      download_manager_->FileSelected(suggested_path, download_id);
   }
 };
 

chrome/browser/download/download_file_picker.cc

@@ -56,8 +56,9 @@ DownloadFilePicker::DownloadFilePicker(
     DownloadManager* download_manager,
     WebContents* web_contents,
     const FilePath& suggested_path,
-    void* params)
+    int32 download_id)
     : download_manager_(download_manager),
+      download_id_(download_id),
       suggested_path_(suggested_path) {
   DCHECK(download_manager_);
   select_file_dialog_ = SelectFileDialog::Create(this);
@@ -76,7 +77,7 @@ DownloadFilePicker::DownloadFilePicker(
                                   string16(),
                                   suggested_path,
                                   &file_type_info, 0, FILE_PATH_LITERAL(""),
-                                  web_contents, owning_window, params);
+                                  web_contents, owning_window, NULL);
 }
 
 DownloadFilePicker::~DownloadFilePicker() {
@@ -96,13 +97,13 @@ void DownloadFilePicker::FileSelected(const FilePath& path,
   FilePickerResult result = ComparePaths(suggested_path_, path);
   RecordFilePickerResult(download_manager_, result);
   if (download_manager_)
-    download_manager_->FileSelected(path, params);
+    download_manager_->FileSelected(path, download_id_);
   delete this;
 }
 
 void DownloadFilePicker::FileSelectionCanceled(void* params) {
   RecordFilePickerResult(download_manager_, FILE_PICKER_CANCEL);
   if (download_manager_)
-    download_manager_->FileSelectionCanceled(params);
+    download_manager_->FileSelectionCanceled(download_id_);
   delete this;
 }

chrome/browser/download/download_file_picker.h

@@ -22,7 +22,7 @@ class DownloadFilePicker : public content::DownloadManager::Observer,
   DownloadFilePicker(content::DownloadManager* download_manager,
                      content::WebContents* web_contents,
                      const FilePath& suggested_path,
-                     void* params);
+                     int32 download_id);
   virtual ~DownloadFilePicker();
 
  private:
@@ -37,6 +37,7 @@ class DownloadFilePicker : public content::DownloadManager::Observer,
   virtual void FileSelectionCanceled(void* params) OVERRIDE;
 
   content::DownloadManager* download_manager_;
+  int32 download_id_;
 
   FilePath suggested_path_;
 

content/browser/download/download_manager_impl.cc

@@ -360,10 +360,6 @@ void DownloadManagerImpl::RestartDownload(int32 download_id) {
     // 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
@@ -375,7 +371,7 @@ void DownloadManagerImpl::RestartDownload(int32 download_id) {
       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 {
@@ -862,14 +858,10 @@ 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;
@@ -883,14 +875,10 @@ void DownloadManagerImpl::FileSelected(const FilePath& path, void* params) {
   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)

content/browser/download/download_manager_impl.h

@@ -81,8 +81,8 @@ class CONTENT_EXPORT DownloadManagerImpl
       bool is_otr,
       content::DownloadItem::Observer* observer) OVERRIDE;
   virtual void ClearLastDownloadPath() OVERRIDE;
-  virtual void FileSelected(const FilePath& path, void* params) OVERRIDE;
-  virtual void FileSelectionCanceled(void* params) OVERRIDE;
+  virtual void FileSelected(const FilePath& path, int32 download_id) OVERRIDE;
+  virtual void FileSelectionCanceled(int32 download_id) OVERRIDE;
   virtual void RestartDownload(int32 download_id) OVERRIDE;
   virtual void CheckForHistoryFilesRemoval() OVERRIDE;
   virtual content::DownloadItem* GetDownloadItem(int id) OVERRIDE;

content/browser/download/download_manager_impl_unittest.cc

@@ -132,7 +132,7 @@ class TestDownloadManagerDelegate : public content::DownloadManagerDelegate {
 
   virtual void ChooseDownloadPath(WebContents* web_contents,
                                   const FilePath& suggested_path,
-                                  void* data) OVERRIDE {
+                                  int32 download_id) OVERRIDE {
     if (!expected_suggested_path_.empty()) {
       EXPECT_STREQ(expected_suggested_path_.value().c_str(),
                    suggested_path.value().c_str());
@@ -142,14 +142,14 @@ class TestDownloadManagerDelegate : public content::DownloadManagerDelegate {
           BrowserThread::UI, FROM_HERE,
           base::Bind(&DownloadManager::FileSelectionCanceled,
                      download_manager_,
-                     base::Unretained(data)));
+                     download_id));
     } else {
       BrowserThread::PostTask(
           BrowserThread::UI, FROM_HERE,
           base::Bind(&DownloadManager::FileSelected,
                      download_manager_,
                      file_selection_response_,
-                     base::Unretained(data)));
+                     download_id));
     }
     expected_suggested_path_.clear();
     file_selection_response_.clear();
@@ -248,8 +248,8 @@ class DownloadManagerTest : public testing::Test {
     download_manager_->OnResponseCompleted(download_id, size, hash);
   }
 
-  void FileSelected(const FilePath& path, void* params) {
-    download_manager_->FileSelected(path, params);
+  void FileSelected(const FilePath& path, int32 download_id) {
+    download_manager_->FileSelected(path, download_id);
   }
 
   void ContinueDownloadWithPath(DownloadItem* download, const FilePath& path) {
@@ -911,14 +911,12 @@ TEST_F(DownloadManagerTest, DownloadRenameTest) {
     state.danger = kDownloadRenameCases[i].danger;
     download->SetFileCheckResults(state);
 
-    int32* id_ptr = new int32;
-    *id_ptr = i;  // Deleted in FileSelected().
     if (kDownloadRenameCases[i].finish_before_rename) {
       OnResponseCompleted(i, 1024, std::string("fake_hash"));
       message_loop_.RunAllPending();
-      FileSelected(new_path, id_ptr);
+      FileSelected(new_path, i);
     } else {
-      FileSelected(new_path, id_ptr);
+      FileSelected(new_path, i);
       message_loop_.RunAllPending();
       OnResponseCompleted(i, 1024, std::string("fake_hash"));
     }

content/public/browser/download_manager.h

@@ -226,8 +226,8 @@ class CONTENT_EXPORT DownloadManager
   virtual void ClearLastDownloadPath() = 0;
 
   // Called by the delegate after the save as dialog is closed.
-  virtual void FileSelected(const FilePath& path, void* params) = 0;
-  virtual void FileSelectionCanceled(void* params) = 0;
+  virtual void FileSelected(const FilePath& path, int32 download_id) = 0;
+  virtual void FileSelectionCanceled(int32 download_id) = 0;
 
   // Called by the delegate if it delayed the download in
   // DownloadManagerDelegate::ShouldStartDownload and now is ready.

content/public/browser/download_manager_delegate.h

@@ -43,7 +43,7 @@ class CONTENT_EXPORT DownloadManagerDelegate {
   // give the answer.
   virtual void ChooseDownloadPath(WebContents* web_contents,
                                   const FilePath& suggested_path,
-                                  void* data) {}
+                                  int32 download_id) {}
 
   // Allows the embedder to set an intermediate name for the download until it's
   // complete. If the embedder doesn't want this return the suggested path.

content/shell/shell_download_manager_delegate.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -104,7 +104,7 @@ void ShellDownloadManagerDelegate::RestartDownload(
 void ShellDownloadManagerDelegate::ChooseDownloadPath(
     WebContents* web_contents,
     const FilePath& suggested_path,
-    void* data) {
+    int32 download_id) {
   FilePath result;
 #if defined(OS_WIN)
   std::wstring file_part = FilePath(suggested_path).BaseName().value();
@@ -132,9 +132,9 @@ void ShellDownloadManagerDelegate::ChooseDownloadPath(
 #endif
 
   if (result.empty()) {
-    download_manager_->FileSelectionCanceled(data);
+    download_manager_->FileSelectionCanceled(download_id);
   } else {
-    download_manager_->FileSelected(result, data);
+    download_manager_->FileSelected(result, download_id);
   }
 }
 

content/shell/shell_download_manager_delegate.h

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -28,7 +28,7 @@ class ShellDownloadManagerDelegate
   virtual bool ShouldStartDownload(int32 download_id) OVERRIDE;
   virtual void ChooseDownloadPath(WebContents* web_contents,
                                   const FilePath& suggested_path,
-                                  void* data) OVERRIDE;
+                                  int32 download_id) OVERRIDE;
 
  private:
   friend class base::RefCountedThreadSafe<ShellDownloadManagerDelegate>;

content/test/mock_download_manager.h

@@ -76,8 +76,8 @@ class MockDownloadManager : public content::DownloadManager {
       bool is_otr,
       content::DownloadItem::Observer* observer));
   MOCK_METHOD0(ClearLastDownloadPath, void());
-  MOCK_METHOD2(FileSelected, void(const FilePath& path, void* params));
-  MOCK_METHOD1(FileSelectionCanceled, void(void* params));
+  MOCK_METHOD2(FileSelected, void(const FilePath& path, int32 download_id));
+  MOCK_METHOD1(FileSelectionCanceled, void(int32 download_id));
   MOCK_METHOD1(RestartDownload, void(int32 download_id));
   MOCK_METHOD0(CheckForHistoryFilesRemoval, void());
   MOCK_METHOD1(GetDownloadItem, content::DownloadItem*(int id));