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

content/browser/download/download_manager_impl_unittest.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 <set>
 #include <string>
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 114 matching lines @@
     return true;
   }
 
   virtual FilePath GetIntermediatePath(
       const FilePath& suggested_path) OVERRIDE {
     return GetTempDownloadPath(suggested_path);
   }
 
   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());
     }
     if (file_selection_response_.empty()) {
       BrowserThread::PostTask(
           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();
   }
 
   virtual bool ShouldOpenFileBasedOnExtension(const FilePath& path) OVERRIDE {
     return path.Extension() == FilePath::StringType(FILE_PATH_LITERAL(".pdf"));
   }
 
   virtual void AddItemToPersistentStore(DownloadItem* item) OVERRIDE {
@@ skipping 78 matching lines @@
     AddDownloadToFileManager(id, download_file);
     ON_CALL(*download_file, GetDownloadManager())
         .WillByDefault(Return(download_manager_));
   }
 
   void OnResponseCompleted(int32 download_id, int64 size,
                            const std::string& hash) {
     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) {
     download_manager_->ContinueDownloadWithPath(download, path);
   }
 
   void UpdateData(int32 id, const char* data, size_t length) {
     // We are passing ownership of this buffer to the download file manager.
     net::IOBuffer* io_buffer = new net::IOBuffer(length);
     // We need |AddRef()| because we do a |Release()| in |UpdateDownload()|.
@@ skipping 641 matching lines @@
           .Times(1)
           .WillOnce(Return(net::OK));
     }
     download_manager_->CreateDownloadItem(info.get(), DownloadRequestHandle());
     DownloadItem* download = GetActiveDownloadItem(i);
     ASSERT_TRUE(download != NULL);
     DownloadStateInfo state = download->GetStateInfo();
     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"));
     }
     // Validating the download item, so it will complete.
     if (state.danger == content::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE)
       download->DangerousDownloadValidated();
     message_loop_.RunAllPending();
   }
 }
 
@@ skipping 371 matching lines @@
   EXPECT_FALSE(observer->hit_state(DownloadItem::INTERRUPTED));
   EXPECT_TRUE(observer->hit_state(DownloadItem::COMPLETE));
   EXPECT_FALSE(observer->hit_state(DownloadItem::REMOVING));
   EXPECT_TRUE(observer->was_updated());
   EXPECT_FALSE(observer->was_opened());
   EXPECT_TRUE(download->GetFileExternallyRemoved());
   EXPECT_EQ(DownloadItem::COMPLETE, download->GetState());
 
   EXPECT_FALSE(file_util::PathExists(new_path));
 }