Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <string> | 5 #include <string> |
| 6 #include <vector> | 6 #include <vector> |
| 7 | 7 |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/bind_helpers.h" | 9 #include "base/bind_helpers.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 1091 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1102 | 1102 |
| 1103 std::string arr[] = { | 1103 std::string arr[] = { |
| 1104 "frames-runtime-changes.htm: 4388232f-8d45-4d2e-9807-721b381be153", | 1104 "frames-runtime-changes.htm: 4388232f-8d45-4d2e-9807-721b381be153", |
| 1105 "subframe1: 21595339-61fc-4854-b6df-0668328ea263", | 1105 "subframe1: 21595339-61fc-4854-b6df-0668328ea263", |
| 1106 "subframe2: adf55719-15e7-45be-9eda-d12fe782a1bd", | 1106 "subframe2: adf55719-15e7-45be-9eda-d12fe782a1bd", |
| 1107 "subframe3: 50e294bf-3a5b-499d-8772-651ead26952f", | 1107 "subframe3: 50e294bf-3a5b-499d-8772-651ead26952f", |
| 1108 "subframe4: e0ea9289-7467-4d32-ba5c-c604e8d84cb7", | 1108 "subframe4: e0ea9289-7467-4d32-ba5c-c604e8d84cb7", |
| 1109 }; | 1109 }; |
| 1110 std::vector<std::string> expected_substrings(std::begin(arr), std::end(arr)); | 1110 std::vector<std::string> expected_substrings(std::begin(arr), std::end(arr)); |
| 1111 | 1111 |
| 1112 // TODO(lukasza): crbug.com/106364: Fix complete-html mode as well. | 1112 // TODO(lukasza): crbug.com/106364: Fix complete-html. |
|
Randy Smith (Not in Mondays)
2015/12/03 20:58:28
Hmmm. Is this comment still up to date? This CL
Łukasz Anforowicz
2015/12/04 21:16:45
The comment is up to date. The test can be enable
Randy Smith (Not in Mondays)
2015/12/07 19:57:14
Willing to change "Fix complete-html" to "Expand c
Łukasz Anforowicz
2015/12/07 20:32:31
Done.
| |
| 1113 if (save_page_type == content::SAVE_PAGE_TYPE_AS_COMPLETE_HTML) | 1113 if (save_page_type == content::SAVE_PAGE_TYPE_AS_COMPLETE_HTML) { |
| 1114 return; | 1114 std::string complete_html_arr[] = { |
| 1115 "frames-runtime-changes.htm: 4388232f-8d45-4d2e-9807-721b381be153", | |
| 1116 }; | |
| 1117 expected_substrings = std::vector<std::string>( | |
| 1118 std::begin(complete_html_arr), std::end(complete_html_arr)); | |
| 1119 } | |
| 1115 | 1120 |
| 1116 GURL url(embedded_test_server()->GetURL( | 1121 GURL url(embedded_test_server()->GetURL( |
| 1117 "a.com", "/save_page/frames-runtime-changes.htm?do_runtime_changes=1")); | 1122 "a.com", "/save_page/frames-runtime-changes.htm?do_runtime_changes=1")); |
| 1118 | 1123 |
| 1119 TestMultiFramePage(save_page_type, url, 5, expected_substrings); | 1124 TestMultiFramePage(save_page_type, url, 5, expected_substrings); |
| 1120 } | 1125 } |
| 1121 | 1126 |
| 1122 INSTANTIATE_TEST_CASE_P( | 1127 INSTANTIATE_TEST_CASE_P( |
| 1123 SaveType, | 1128 SaveType, |
| 1124 SavePageMultiFrameBrowserTest, | 1129 SavePageMultiFrameBrowserTest, |
| 1125 ::testing::Values(content::SAVE_PAGE_TYPE_AS_COMPLETE_HTML, | 1130 ::testing::Values(content::SAVE_PAGE_TYPE_AS_COMPLETE_HTML, |
| 1126 content::SAVE_PAGE_TYPE_AS_MHTML)); | 1131 content::SAVE_PAGE_TYPE_AS_MHTML)); |
| 1127 | 1132 |
| 1128 } // namespace | 1133 } // namespace |
| OLD | NEW |