Merge to M57: Remove popup overlay from MHTML when requested

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 <memory>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/files/file_path.h"
@@ skipping 631 matching lines @@
   EXPECT_THAT(mhtml, HasSubstr("This page has no title"));  // From title1.html.
 
   // 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"));
 }
 
+IN_PROC_BROWSER_TEST_F(MHTMLGenerationTest, RemovePopupOverlay) {
+  base::FilePath path(temp_dir_.GetPath());
+  path = path.Append(FILE_PATH_LITERAL("test.mht"));
+
+  GURL url(embedded_test_server()->GetURL("/popup.html"));
+
+  MHTMLGenerationParams params(path);
+  params.remove_popup_overlay = true;
+
+  GenerateMHTML(params, url);
+  ASSERT_FALSE(HasFailure());
+
+  std::string mhtml;
+  {
+    base::ThreadRestrictions::ScopedAllowIO allow_io_for_content_verification;
+    ASSERT_TRUE(base::ReadFileToString(path, &mhtml));
+  }
+
+  // Make sure the overlay is removed.
+  EXPECT_THAT(mhtml, Not(HasSubstr("class=3D\"overlay")));
+  EXPECT_THAT(mhtml, Not(HasSubstr("class=3D\"modal")));
+}
+
 }  // namespace content