Patch for bug 9336...

chrome/browser/download/save_package.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 "chrome/browser/download/save_package.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
@@ skipping 542 matching lines @@
   wait_state_ = FAILED;
 
   // Inform the DownloadItem we have canceled whole save page job.
   download_->Cancel(false);
 }
 
 void SavePackage::CheckFinish() {
   if (in_process_count() || finished_)
     return;
 
-  FilePath dir = save_type_ == SAVE_AS_COMPLETE_HTML ?
-                 saved_main_directory_path_ :
-                 FilePath();
+  FilePath dir = (save_type_ == SAVE_AS_COMPLETE_HTML &&
+                  saved_success_items_.size() > 1) ?
+                  saved_main_directory_path_ : FilePath();
 
   // This vector contains the final names of all the successfully saved files
   // along with their save ids. It will be passed to SaveFileManager to do the
   // renaming job.
   FinalNameList final_names;
   for (SavedItemMap::iterator it = saved_success_items_.begin();
       it != saved_success_items_.end(); ++it)
     final_names.push_back(std::make_pair(it->first,
                                          it->second->full_path()));
 
@@ skipping 536 matching lines @@
   if (available_length > 0) {
     *pure_file_name =
         pure_file_name->substr(0, available_length);
     return true;
   }
 
   // Not enough room to even use a shortened |pure_file_name|.
   pure_file_name->clear();
   return false;
 }