Offline Pages: Use 'binary encoding' to create MHTML, instead of base64.

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/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);
+  }
+
+  void GenerateMHTML(const base::FilePath& path,
+                     const GURL& url,
+                     bool use_binary_encoding) {
     NavigateToURL(shell(), url);
 
     base::RunLoop run_loop;
     shell()->web_contents()->GenerateMHTML(
-        path, base::Bind(&MHTMLGenerationTest::MHTMLGenerated, this,
-                         run_loop.QuitClosure()));
+        path, use_binary_encoding,
+        base::Bind(&MHTMLGenerationTest::MHTMLGenerated, this,
+                   run_loop.QuitClosure()));
 
     // Block until the MHTML is generated.
     run_loop.Run();
 
     EXPECT_TRUE(has_mhtml_callback_run());
   }
 
   bool has_mhtml_callback_run() const { return has_mhtml_callback_run_; }
   int64_t file_size() const { return file_size_; }
 
@@ skipping 19 matching lines @@
   path = path.Append(FILE_PATH_LITERAL("test.mht"));
 
   GenerateMHTML(path, embedded_test_server()->GetURL("/simple_page.html"));
   ASSERT_FALSE(HasFailure());
 
   // Make sure the actual generated file has some contents.
   EXPECT_GT(file_size(), 0);  // Verify the size reported by the callback.
   int64_t file_size;
   ASSERT_TRUE(base::GetFileSize(path, &file_size));
   EXPECT_GT(file_size, 100);  // Verify the actual file size.
+
+  std::string mhtml;
+  ASSERT_TRUE(base::ReadFileToString(path, &mhtml));
+  EXPECT_THAT(mhtml,
+              HasSubstr("Content-Transfer-Encoding: quoted-printable"));
 }
 
 IN_PROC_BROWSER_TEST_F(MHTMLGenerationTest, InvalidPath) {
   base::FilePath path(FILE_PATH_LITERAL("/invalid/file/path"));
 
   GenerateMHTML(path, embedded_test_server()->GetURL(
                           "/download/local-about-blank-subframes.html"));
   ASSERT_FALSE(HasFailure());  // No failures with the invocation itself?
 
   EXPECT_EQ(file_size(), -1);  // Expecting that the callback reported failure.
 }
 
+IN_PROC_BROWSER_TEST_F(MHTMLGenerationTest, GenerateNonBinaryMHTMLWithImage) {

[nasko, 2016/04/20 17:01:15]

Please add a comment describing what this case is testing.

[dewittj, 2016/04/20 20:20:59]

Done.

+  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);
+  ASSERT_FALSE(HasFailure());
+  EXPECT_NE(file_size(), -1);
+
+  std::string mhtml;
+  ASSERT_TRUE(base::ReadFileToString(path, &mhtml));

[nasko, 2016/04/20 17:01:15]

Can we also check file size? It is done in other test cases.

[dewittj, 2016/04/20 20:20:59]

Done.

+  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"));
+}
+
+IN_PROC_BROWSER_TEST_F(MHTMLGenerationTest, GenerateBinaryMHTML) {

[nasko, 2016/04/20 17:01:15]

Be consistent with naming. If the previous test case is named "WithImage", so
should this one as the difference is binary vs non-binary, not "with image" vs
"without image".

[nasko, 2016/04/20 17:01:15]

Add a comment here too.

[dewittj, 2016/04/20 20:20:59]

Done.

+  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);
+  ASSERT_FALSE(HasFailure());
+  EXPECT_NE(file_size(), -1);
+
+  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"));
+}
+
 // 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 35 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