Port more tests from save_page_uitest.cc to save_page_browsertest.cc.

chrome/browser/tab_contents/tab_contents.cc

 // Copyright (c) 2009 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/tab_contents/tab_contents.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/file_version_info.h"
 #include "base/process_util.h"
@@ skipping 1011 matching lines @@
   // Create the save package and possibly prompt the user for the name to save
   // the page as. The user prompt is an asynchronous operation that runs on
   // another thread.
   save_package_ = new SavePackage(this);
   save_package_->GetSaveInfo();
 }
 
 // Used in automated testing to bypass prompting the user for file names.
 // Instead, the names and paths are hard coded rather than running them through
 // file name sanitation and extension / mime checking.
-void TabContents::SavePage(const std::wstring& main_file,
+bool TabContents::SavePage(const std::wstring& main_file,
                            const std::wstring& dir_path,
                            SavePackage::SavePackageType save_type) {
   // Stop the page from navigating.
   Stop();
 
   save_package_ = new SavePackage(this, save_type,
                                   FilePath::FromWStringHack(main_file),
                                   FilePath::FromWStringHack(dir_path));
-  save_package_->Init();
+  return save_package_->Init();
 }
 
 void TabContents::PrintPreview() {
   // We don't show the print preview yet, only the print dialog.
   PrintNow();
 }
 
 bool TabContents::PrintNow() {
   // We can't print interstitial page for now.
   if (showing_interstitial_page())
@@ skipping 1325 matching lines @@
       NavigationController::LoadCommittedDetails& committed_details =
           *(Details<NavigationController::LoadCommittedDetails>(details).ptr());
       ExpireInfoBars(committed_details);
       break;
     }
 
     default:
       NOTREACHED();
   }
 }