| 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 "base/prefs/pref_service.h" | 5 #include "base/prefs/pref_service.h" |
| 6 #include "base/strings/utf_string_conversions.h" | 6 #include "base/strings/utf_string_conversions.h" |
| 7 #include "chrome/app/chrome_command_ids.h" | 7 #include "chrome/app/chrome_command_ids.h" |
| 8 #include "chrome/browser/content_settings/host_content_settings_map.h" | 8 #include "chrome/browser/content_settings/host_content_settings_map.h" |
| 9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
| 10 #include "chrome/browser/task_manager/task_manager_browsertest_util.h" | 10 #include "chrome/browser/task_manager/task_manager_browsertest_util.h" |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 95 // Create the print preview dialog. | 95 // Create the print preview dialog. |
| 96 Print(); | 96 Print(); |
| 97 | 97 |
| 98 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAboutBlankTab())); | 98 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAboutBlankTab())); |
| 99 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab())); | 99 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab())); |
| 100 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyPrint())); | 100 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyPrint())); |
| 101 ASSERT_NO_FATAL_FAILURE( | 101 ASSERT_NO_FATAL_FAILURE( |
| 102 WaitForTaskManagerRows(1, MatchPrint(url::kAboutBlankURL))); | 102 WaitForTaskManagerRows(1, MatchPrint(url::kAboutBlankURL))); |
| 103 } | 103 } |
| 104 | 104 |
| 105 // Disable the test for mac as it started being flaky, see http://crbug/367665. | 105 // http://crbug/367665. |
| 106 #if defined(OS_MACOSX) && !defined(OS_IOS) | |
| 107 #define MAYBE_TaskManagerExistingPrintPreview DISABLED_TaskManagerExistingPrintP
review | |
| 108 #else | |
| 109 #define MAYBE_TaskManagerExistingPrintPreview TaskManagerExistingPrintPreview | |
| 110 #endif | |
| 111 IN_PROC_BROWSER_TEST_F(PrintPreviewTest, | 106 IN_PROC_BROWSER_TEST_F(PrintPreviewTest, |
| 112 MAYBE_TaskManagerExistingPrintPreview) { | 107 DISABLED_TaskManagerExistingPrintPreview) { |
| 113 // Create the print preview dialog. | 108 // Create the print preview dialog. |
| 114 Print(); | 109 Print(); |
| 115 | 110 |
| 116 chrome::ShowTaskManager(browser()); // Show task manager AFTER print dialog. | 111 chrome::ShowTaskManager(browser()); // Show task manager AFTER print dialog. |
| 117 | 112 |
| 118 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAboutBlankTab())); | 113 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAboutBlankTab())); |
| 119 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab())); | 114 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab())); |
| 120 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyPrint())); | 115 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyPrint())); |
| 121 ASSERT_NO_FATAL_FAILURE( | 116 ASSERT_NO_FATAL_FAILURE( |
| 122 WaitForTaskManagerRows(1, MatchPrint(url::kAboutBlankURL))); | 117 WaitForTaskManagerRows(1, MatchPrint(url::kAboutBlankURL))); |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 176 | 171 |
| 177 ASSERT_EQ(result, SIMPLEREGION); | 172 ASSERT_EQ(result, SIMPLEREGION); |
| 178 bool rects_equal = | 173 bool rects_equal = |
| 179 region_before.left == region_after.left && | 174 region_before.left == region_after.left && |
| 180 region_before.top == region_after.top && | 175 region_before.top == region_after.top && |
| 181 region_before.right == region_after.right && | 176 region_before.right == region_after.right && |
| 182 region_before.bottom == region_after.bottom; | 177 region_before.bottom == region_after.bottom; |
| 183 ASSERT_FALSE(rects_equal); | 178 ASSERT_FALSE(rects_equal); |
| 184 } | 179 } |
| 185 | 180 |
| 186 IN_PROC_BROWSER_TEST_F(PrintPreviewTest, NoCrashOnCloseWithOtherTabs) { | 181 // http://crbug.com/396360 |
| 182 IN_PROC_BROWSER_TEST_F(PrintPreviewTest, DISABLED_NoCrashOnCloseWithOtherTabs) { |
| 187 // Now print preview. | 183 // Now print preview. |
| 188 Print(); | 184 Print(); |
| 189 | 185 |
| 190 ui_test_utils::NavigateToURLWithDisposition( | 186 ui_test_utils::NavigateToURLWithDisposition( |
| 191 browser(), GURL("about:blank"), NEW_FOREGROUND_TAB, | 187 browser(), GURL("about:blank"), NEW_FOREGROUND_TAB, |
| 192 ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); | 188 ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); |
| 193 | 189 |
| 194 browser()->tab_strip_model()->ActivateTabAt(0, true); | 190 browser()->tab_strip_model()->ActivateTabAt(0, true); |
| 195 | 191 |
| 196 // Navigate main tab to hide print preview. | 192 // Navigate main tab to hide print preview. |
| 197 ui_test_utils::NavigateToURL(browser(), GURL("about:blank")); | 193 ui_test_utils::NavigateToURL(browser(), GURL("about:blank")); |
| 198 | 194 |
| 199 browser()->tab_strip_model()->ActivateTabAt(1, true); | 195 browser()->tab_strip_model()->ActivateTabAt(1, true); |
| 200 } | 196 } |
| 201 #endif // defined(OS_WIN) | 197 #endif // defined(OS_WIN) |
| 202 | 198 |
| 203 } // namespace | 199 } // namespace |
| OLD | NEW |