Save Page As MHTML

chrome/browser/download/save_page_browsertest.cc

Index: chrome/browser/download/save_page_browsertest.cc
diff --git a/chrome/browser/download/save_page_browsertest.cc b/chrome/browser/download/save_page_browsertest.cc
index 49e351a3ad1fe1fab596178000feb47caacbe169..8949fbbb92718289bc2e64a7b4600f549eab87ed 100644
--- a/chrome/browser/download/save_page_browsertest.cc
+++ b/chrome/browser/download/save_page_browsertest.cc
@@ -4,6 +4,7 @@
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
+#include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ -17,11 +18,15 @@
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/download/save_package_file_picker.h"
 #include "chrome/browser/net/url_request_mock_util.h"
+#include "chrome/browser/prefs/pref_member.h"
+#include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/webui/chromeos/active_downloads_ui.h"
 #include "chrome/common/chrome_paths.h"
+#include "chrome/common/chrome_switches.h"
+#include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
@@ -54,6 +59,10 @@ static const char* kAppendedExtension =
 }  // namespace
 
 class SavePageBrowserTest : public InProcessBrowserTest {
+ public:
+  SavePageBrowserTest() {}
+  virtual ~SavePageBrowserTest();
+
  protected:
   void SetUp() OVERRIDE {
     ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_dir_));
@@ -62,6 +71,8 @@ class SavePageBrowserTest : public InProcessBrowserTest {
   }
 
   void SetUpOnMainThread() OVERRIDE {
+    browser()->profile()->GetPrefs()->SetFilePath(
+        prefs::kDownloadDefaultDirectory, save_dir_.path());
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&chrome_browser_net::SetUrlRequestMocksEnabled, true));
@@ -184,12 +195,27 @@ class SavePageBrowserTest : public InProcessBrowserTest {
 
   void CheckDownloadHistory(const GURL& url,
                             const FilePath& path,
-                            int64 num_files_) {
+                            int64 num_files) {
     QueryDownloadHistory();
 
-    EXPECT_NE(std::find_if(history_entries_.begin(), history_entries_.end(),
-        DownloadPersistentStoreInfoMatch(url, path, num_files_)),
-        history_entries_.end());
+    std::vector<DownloadPersistentStoreInfo>::iterator found =
+      std::find_if(history_entries_.begin(), history_entries_.end(),
+                   DownloadPersistentStoreInfoMatch(url, path, num_files));
+
+    if (found == history_entries_.end()) {
+      LOG(ERROR) << "Missing url=" << url.spec()
+                 << " path=" << path.value()
+                 << " received=" << num_files;
+      for (size_t index = 0; index < history_entries_.size(); ++index) {
+        LOG(ERROR) << "History@" << index << ": url="
+                   << history_entries_[index].url.spec()
+                   << " path=" << history_entries_[index].path.value()
+                   << " received=" << history_entries_[index].received_bytes
+                   << " total=" << history_entries_[index].total_bytes
+                   << " state=" << history_entries_[index].state;
+      }
+      EXPECT_TRUE(false);
+    }
   }
 
   std::vector<DownloadPersistentStoreInfo> history_entries_;
@@ -199,8 +225,14 @@ class SavePageBrowserTest : public InProcessBrowserTest {
 
   // Temporary directory we will save pages to.
   ScopedTempDir save_dir_;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(SavePageBrowserTest);
 };
 
+SavePageBrowserTest::~SavePageBrowserTest() {
+}
+
 IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, SaveHTMLOnly) {
   GURL url = NavigateToMockURL("a");
 
@@ -369,3 +401,39 @@ IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, CleanFilenameFromPageTitle) {
   EXPECT_TRUE(file_util::DieFileDie(dir, true));
 }
 #endif
+
+class SavePageAsMHTMLBrowserTest : public SavePageBrowserTest {
+ public:
+  SavePageAsMHTMLBrowserTest() {}
+  virtual ~SavePageAsMHTMLBrowserTest();
+  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+    command_line->AppendSwitch(switches::kSavePageAsMHTML);

[Randy Smith (Not in Mondays), 2012/04/18 18:00:55]

Don't you need to switch this back at the end of the test, lest you change state
for tests following this one?

[benjhayden, 2012/04/18 18:19:02]

It doesn't look like any other tests do that, and InProcessBrowserTest doesn't
mention it.
If anybody makes any more SavePageAsMHTMLBrowserTest TEST_Fs, then they'll still
want the switch. After the last SavePageAsMHTMLBrowserTest runs, it will shut
down its browser, taking this switch with it.

[Randy Smith (Not in Mondays), 2012/04/24 17:23:54]

Actually, now that I get my memory system working, I think a new process is
created for each separate test (i.e. SavePageAsMHTML, etc.)  So yeah, this is
fine.  

+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(SavePageAsMHTMLBrowserTest);
+};
+
+SavePageAsMHTMLBrowserTest::~SavePageAsMHTMLBrowserTest() {
+}
+
+IN_PROC_BROWSER_TEST_F(SavePageAsMHTMLBrowserTest, SavePageAsMHTML) {
+  GURL url = NavigateToMockURL("b");
+  FilePath download_dir = DownloadPrefs::FromDownloadManager(
+      GetDownloadManager())->download_path();
+  FilePath full_file_name = download_dir.AppendASCII(std::string(
+      "Test page for saving page feature.mhtml"));
+  SavePackageFilePicker::SetShouldPromptUser(false);
+  ui_test_utils::WindowedNotificationObserver observer(
+        content::NOTIFICATION_SAVE_PACKAGE_SUCCESSFULLY_FINISHED,
+        content::NotificationService::AllSources());
+  browser()->SavePage();
+  observer.Wait();
+  CheckDownloadUI(full_file_name);
+  CheckDownloadHistory(url, full_file_name, 1);
+
+  EXPECT_TRUE(file_util::PathExists(full_file_name));
+  int64 actual_file_size = -1;
+  EXPECT_TRUE(file_util::GetFileSize(full_file_name, &actual_file_size));
+  EXPECT_EQ(2760, actual_file_size);
+}