Save-Page-As-Complete-HTML: Better handling of <object> elements.

chrome/browser/download/save_page_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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 987 matching lines @@
 
   // TODO(lukasza/paulmeyer): crbug.com/457440: Can enable verification
   // of the original page once find-in-page works for OOP frames.
   bool skip_verification_of_original_page = true;
 
   TestMultiFramePage(save_page_type, url, 3, expected_substrings,
                      skip_verification_of_original_page);
 }
 
 // Test for crbug.com/553478.
-IN_PROC_BROWSER_TEST_P(SavePageMultiFrameBrowserTest, DISABLED_ObjectElements) {
+IN_PROC_BROWSER_TEST_P(SavePageMultiFrameBrowserTest, ObjectElements) {
   content::SavePageType save_page_type = GetParam();
 
   // 4 = main frame + iframe + object w/ html doc + object w/ pdf doc
   // (svg and png objects do not get a separate frame)
   int expected_number_of_frames = 4;
 
   std::vector<std::string> expected_substrings{
       "frames-objects.htm: 8da13db4-a512-4d9b-b1c5-dc1c134234b9",
       "a.htm: 1b8aae2b-e164-462f-bd5b-98aa366205f2",
       "b.htm: 3a35f7fa-96a9-4487-9f18-4470263907fa",
   };
 
   GURL url(
       embedded_test_server()->GetURL("a.com", "/save_page/frames-objects.htm"));
 
+  // TODO(lukasza): crbug.com/553478: Enable <object> testing of MHTML.
+  if (save_page_type == content::SAVE_PAGE_TYPE_AS_MHTML)
+    return;
+
   TestMultiFramePage(save_page_type, url, expected_number_of_frames,
                      expected_substrings);
 }
 
 IN_PROC_BROWSER_TEST_P(SavePageMultiFrameBrowserTest, AboutBlank) {
   content::SavePageType save_page_type = GetParam();
 
   std::vector<std::string> expected_substrings{
       "main: acb0609d-eb10-4c26-83e2-ad8afb7b0ff3",
       "sub1: b124df3a-d39f-47a1-ae04-5bb5d0bf549e",
@@ skipping 23 matching lines @@
   TestMultiFramePage(save_page_type, url, 3, expected_substrings);
 }
 
 INSTANTIATE_TEST_CASE_P(
     ,
     SavePageMultiFrameBrowserTest,
     ::testing::Values(content::SAVE_PAGE_TYPE_AS_COMPLETE_HTML,
                       content::SAVE_PAGE_TYPE_AS_MHTML));
 
 }  // namespace