Introduces a new MHTML generation parameter specifying different behvaior for cache-control headers.

content/browser/download/mhtml_generation_browsertest.cc

 // Copyright (c) 2012 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 <stdint.h>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/common/mhtml_generation.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 #include "content/shell/browser/shell.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::ContainsRegex;
 using testing::HasSubstr;
 using testing::Not;
 
 namespace content {
 
 class MHTMLGenerationTest : public ContentBrowserTest {
  public:
   MHTMLGenerationTest() : has_mhtml_callback_run_(false), file_size_(0) {}
 
  protected:
   void SetUp() override {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     ASSERT_TRUE(embedded_test_server()->Start());
     ContentBrowserTest::SetUp();
   }
 
   void GenerateMHTML(const base::FilePath& path, const GURL& url) {
-    GenerateMHTML(path, url, false);
+    GenerateMHTML(MHTMLGenerationParams(path), url);
   }
 
-  void GenerateMHTML(const base::FilePath& path,
-                     const GURL& url,
-                     bool use_binary_encoding) {
+  void GenerateMHTML(const MHTMLGenerationParams& params, const GURL& url) {
     NavigateToURL(shell(), url);
 
     base::RunLoop run_loop;
+
     shell()->web_contents()->GenerateMHTML(
-        path, use_binary_encoding,
-        base::Bind(&MHTMLGenerationTest::MHTMLGenerated, this,
-                   run_loop.QuitClosure()));
+        params, base::Bind(&MHTMLGenerationTest::MHTMLGenerated, this,
+                           run_loop.QuitClosure()));
 
     // Block until the MHTML is generated.
     run_loop.Run();
 
     EXPECT_TRUE(has_mhtml_callback_run());
   }
 
   int64_t ReadFileSizeFromDisk(base::FilePath path) {
     int64_t file_size;
     if (!base::GetFileSize(path, &file_size)) return -1;
@@ skipping 48 matching lines @@
 }
 
 // Tests that MHTML generated using the default 'quoted-printable' encoding does
 // not contain the 'binary' Content-Transfer-Encoding header, and generates
 // base64 encoding for the image part.
 IN_PROC_BROWSER_TEST_F(MHTMLGenerationTest, GenerateNonBinaryMHTMLWithImage) {
   base::FilePath path(temp_dir_.path());
   path = path.Append(FILE_PATH_LITERAL("test_binary.mht"));
 
   GURL url(embedded_test_server()->GetURL("/page_with_image.html"));
-  GenerateMHTML(path, url, false);
+  GenerateMHTML(path, url);
   ASSERT_FALSE(HasFailure());
   EXPECT_GT(file_size(), 0);  // Verify the size reported by the callback.
   EXPECT_GT(ReadFileSizeFromDisk(path), 100);  // Verify the actual file size.
 
   std::string mhtml;
   ASSERT_TRUE(base::ReadFileToString(path, &mhtml));
   EXPECT_THAT(mhtml, HasSubstr("Content-Transfer-Encoding: base64"));
   EXPECT_THAT(mhtml, Not(HasSubstr("Content-Transfer-Encoding: binary")));
   EXPECT_THAT(mhtml, ContainsRegex("Content-Location:.*blank.jpg"));
 }
 
 // Tests that MHTML generated using the binary encoding contains the 'binary'
 // Content-Transfer-Encoding header, and does not contain any base64 encoded
 // parts.
 IN_PROC_BROWSER_TEST_F(MHTMLGenerationTest, GenerateBinaryMHTMLWithImage) {
   base::FilePath path(temp_dir_.path());
   path = path.Append(FILE_PATH_LITERAL("test_binary.mht"));
 
   GURL url(embedded_test_server()->GetURL("/page_with_image.html"));
-  GenerateMHTML(path, url, true);
+  MHTMLGenerationParams params(path);
+  params.use_binary_encoding = true;
+
+  GenerateMHTML(params, url);
   ASSERT_FALSE(HasFailure());
   EXPECT_GT(file_size(), 0);  // Verify the size reported by the callback.
   EXPECT_GT(ReadFileSizeFromDisk(path), 100);  // Verify the actual file size.
 
   std::string mhtml;
   ASSERT_TRUE(base::ReadFileToString(path, &mhtml));
   EXPECT_THAT(mhtml, HasSubstr("Content-Transfer-Encoding: binary"));
   EXPECT_THAT(mhtml, Not(HasSubstr("Content-Transfer-Encoding: base64")));
   EXPECT_THAT(mhtml, ContainsRegex("Content-Location:.*blank.jpg"));
 }
 
+IN_PROC_BROWSER_TEST_F(MHTMLGenerationTest, GenerateMHTMLIgnoreNoStore) {
+  base::FilePath path(temp_dir_.path());
+  path = path.Append(FILE_PATH_LITERAL("test.mht"));
+
+  GURL url(embedded_test_server()->GetURL("/nostore.html"));
+
+  // First, generate MHTML without specifying the new policy.

[Łukasz Anforowicz, 2016/05/12 18:56:48]

nit: // Generate MHTML without specifying FAIL_FOR_NO_STORE_MAIN_FRAME policy.

[dewittj, 2016/05/12 22:58:01]

Done.

+  GenerateMHTML(path, url);
+  // We expect that there wasn't an error (file size -1 indicates an error.)
+  ASSERT_FALSE(HasFailure());
+
+  std::string mhtml;
+  ASSERT_TRUE(base::ReadFileToString(path, &mhtml));
+
+  // Make sure the contents of the body are present.
+  EXPECT_THAT(mhtml, HasSubstr("test body"));
+
+  // Make sure that URL of the content is present.
+  EXPECT_THAT(mhtml, ContainsRegex("Content-Location:.*/nostore.html"));
+}
+
+IN_PROC_BROWSER_TEST_F(MHTMLGenerationTest, GenerateMHTMLObeyNoStoreMainFrame) {
+  base::FilePath path(temp_dir_.path());
+  path = path.Append(FILE_PATH_LITERAL("test.mht"));
+
+  GURL url(embedded_test_server()->GetURL("/nostore.html"));
+
+  // First, generate MHTML without specifying the new policy.

[Łukasz Anforowicz, 2016/05/12 18:56:48]

nit: // Generate MHTML specifying FAIL_FOR_NO_STORE_MAIN_FRAME policy.

[dewittj, 2016/05/12 22:58:01]

Done.

+  MHTMLGenerationParams params(path);
+  params.cache_control_policy =
+      content::MHTMLCacheControlPolicy::FAIL_FOR_NO_STORE_MAIN_FRAME;
+
+  GenerateMHTML(params, url);
+  // We expect that there was an error (file size -1 indicates an error.)
+  EXPECT_EQ(-1, file_size());
+
+  std::string mhtml;
+  ASSERT_TRUE(base::ReadFileToString(path, &mhtml));
+
+  // Make sure the contents are missing.
+  EXPECT_THAT(mhtml, Not(HasSubstr("test body")));
+}
+
 // Test suite that allows testing --site-per-process against cross-site frames.
 // See http://dev.chromium.org/developers/design-documents/site-isolation.
 class MHTMLGenerationSitePerProcessTest : public MHTMLGenerationTest {
  public:
   MHTMLGenerationSitePerProcessTest() {}
 
  protected:
   void SetUpCommandLine(base::CommandLine* command_line) override {
     MHTMLGenerationTest::SetUpCommandLine(command_line);
 
@@ skipping 32 matching lines @@
 
   // Make sure that URLs of both frames are present
   // (note that these are single-line regexes).
   EXPECT_THAT(
       mhtml,
       ContainsRegex("Content-Location:.*/frame_tree/page_with_one_frame.html"));
   EXPECT_THAT(mhtml, ContainsRegex("Content-Location:.*/title1.html"));
 }
 
 }  // namespace content