Fix save complete .html page.

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 943 matching lines @@
     // Create filter string.
     std::wstring filter = l10n_util::GetString(IDS_SAVE_PAGE_FILTER);
     filter.resize(filter.size() + 2);
     filter[filter.size() - 1] = L'\0';
     filter[filter.size() - 2] = L'\0';
 
     if (g_should_prompt_for_filename) {
       // Since we take the suggested name from the web page's title, we want to
       // ignore the file extension generated by SaveFileAsWithFilter, since it
       // will always be ".htm".
-      // TODO(estade): is this saved_main_file_path assignment behavior desired?
-      // It was copied from previous code but seems strange.
       std::wstring main_file_path;
-      if (!win_util::SaveFileAsWithFilter(container_hwnd,
-                                          suggest_name.value(),
-                                          filter,
-                                          L"htm",
-                                          true,
-                                          &index,
-                                          &main_file_path)) {
-        param->saved_main_file_path = FilePath(main_file_path);
+      bool success = win_util::SaveFileAsWithFilter(container_hwnd,
+          suggest_name.value(), filter, L"htm", true, &index, &main_file_path);
+      param->saved_main_file_path = FilePath(main_file_path);
+      if (!success)
         return false;
-      }
     } else {
       param->saved_main_file_path = suggest_name;
     }
   } else {
     if (g_should_prompt_for_filename) {
       // TODO(estade): see above comment.
       std::wstring main_file_path;
       if (!win_util::SaveFileAs(container_hwnd, suggest_name.value(),
                                 &main_file_path))
         param->saved_main_file_path = FilePath(main_file_path);
@@ skipping 79 matching lines @@
     *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;
 }