Fix download path bugs

chrome/browser/download/download_manager.cc

 // Copyright (c) 2006-2008 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 <time.h>
 
 #include "chrome/browser/download/download_manager.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
@@ skipping 801 matching lines @@
 
 // Called on the file thread.  Renames the downloaded file to its original name.
 void DownloadManager::ProceedWithFinishedDangerousDownload(
     int64 download_handle,
     const FilePath& path,
     const FilePath& original_name) {
   bool success = false;
   FilePath new_path;
   int uniquifier = 0;
   if (file_util::PathExists(path)) {
-    new_path = new_path.DirName().Append(original_name);
+    new_path = path.DirName().Append(original_name);
     // Make our name unique at this point, as if a dangerous file is downloading
     // and a 2nd download is started for a file with the same name, they would
     // have the same path.  This is because we uniquify the name on download
     // start, and at that time the first file does not exists yet, so the second
     // file gets the same name.
     uniquifier = GetUniquePathNumber(new_path);
     if (uniquifier > 0)
       AppendNumberToPath(&new_path, uniquifier);
     success = file_util::Move(path, new_path);
   } else {
@@ skipping 547 matching lines @@
       searched_downloads.push_back(dit->second);
   }
 
   requestor->SetDownloads(searched_downloads);
 }
 
 // Clears the last download path, used to initialize "save as" dialogs.
 void DownloadManager::ClearLastDownloadPath() {
   last_download_path_ = FilePath();
 }