| Index: chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc
|
| ===================================================================
|
| --- chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc (revision 277945)
|
| +++ chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc (working copy)
|
| @@ -21,6 +21,7 @@
|
| #include "content/public/test/browser_test_utils.h"
|
| #include "content/public/test/test_navigation_observer.h"
|
| #include "content/public/test/test_utils.h"
|
| +#include "url/url_constants.h"
|
|
|
| #if defined(OS_WIN)
|
| #include "ui/aura/window.h"
|
| @@ -48,10 +49,6 @@
|
| }
|
| };
|
|
|
| -// The two tests below are failing on Linux LSAN
|
| -// crbug.com/382523
|
| -#if !defined(ADDRESS_SANITIZER)
|
| -
|
| IN_PROC_BROWSER_TEST_F(PrintPreviewTest, PrintCommands) {
|
| // We start off at about:blank page.
|
| // Make sure there is 1 tab and print is enabled.
|
| @@ -101,17 +98,13 @@
|
| ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAboutBlankTab()));
|
| ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
|
| ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyPrint()));
|
| - ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchPrint("about:blank")));
|
| + ASSERT_NO_FATAL_FAILURE(
|
| + WaitForTaskManagerRows(1, MatchPrint(url::kAboutBlankURL)));
|
| }
|
|
|
| -#endif
|
| -
|
| // Disable the test for mac as it started being flaky, see http://crbug/367665.
|
| #if defined(OS_MACOSX) && !defined(OS_IOS)
|
| #define MAYBE_TaskManagerExistingPrintPreview DISABLED_TaskManagerExistingPrintPreview
|
| -// Disable the test for Linux LSAN, see http://crbug.com/382764.
|
| -#elif defined(OS_LINUX) && defined(ADDRESS_SANITIZER)
|
| -#define MAYBE_TaskManagerExistingPrintPreview DISABLED_TaskManagerExistingPrintPreview
|
| #else
|
| #define MAYBE_TaskManagerExistingPrintPreview TaskManagerExistingPrintPreview
|
| #endif
|
| @@ -125,11 +118,11 @@
|
| ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAboutBlankTab()));
|
| ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
|
| ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyPrint()));
|
| - ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchPrint("about:blank")));
|
| + ASSERT_NO_FATAL_FAILURE(
|
| + WaitForTaskManagerRows(1, MatchPrint(url::kAboutBlankURL)));
|
| }
|
|
|
| #if defined(OS_WIN)
|
| -
|
| BOOL CALLBACK EnumerateChildren(HWND hwnd, LPARAM l_param) {
|
| HWND* child = reinterpret_cast<HWND*>(l_param);
|
| *child = hwnd;
|
| @@ -205,6 +198,6 @@
|
|
|
| browser()->tab_strip_model()->ActivateTabAt(1, true);
|
| }
|
| -#endif
|
| +#endif // defined(OS_WIN)
|
|
|
| } // namespace
|
|
|