Commit ececc5a2 authored by calamity's avatar calamity Committed by Commit bot

Move BrowserWindowPropertyManager tests to interactive_ui_tests and reenable.

This test was flaky because it modified system properties. Moving it to
interactive_ui_tests should allow it the system control guarantees it
needs to complete successfully.

BUG=396344

Review URL: https://codereview.chromium.org/492623003

Cr-Commit-Position: refs/heads/master@{#291860}
parent 24501f27
...@@ -176,7 +176,7 @@ class BrowserTestWithProfileShortcutManager : public InProcessBrowserTest { ...@@ -176,7 +176,7 @@ class BrowserTestWithProfileShortcutManager : public InProcessBrowserTest {
// Check that the window properties on Windows are properly set. // Check that the window properties on Windows are properly set.
// http://crbug.com/396344 // http://crbug.com/396344
IN_PROC_BROWSER_TEST_F(BrowserTestWithProfileShortcutManager, IN_PROC_BROWSER_TEST_F(BrowserTestWithProfileShortcutManager,
DISABLED_WindowProperties) { WindowProperties) {
// Disable this test in Metro+Ash where Windows window properties aren't used. // Disable this test in Metro+Ash where Windows window properties aren't used.
if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
return; return;
...@@ -226,7 +226,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTestWithProfileShortcutManager, ...@@ -226,7 +226,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTestWithProfileShortcutManager,
} }
// http://crbug.com/396344 // http://crbug.com/396344
IN_PROC_BROWSER_TEST_F(BrowserWindowPropertyManagerTest, DISABLED_HostedApp) { IN_PROC_BROWSER_TEST_F(BrowserWindowPropertyManagerTest, HostedApp) {
#if defined(USE_ASH) #if defined(USE_ASH)
// Disable this test in Metro+Ash where Windows window properties aren't used. // Disable this test in Metro+Ash where Windows window properties aren't used.
if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
......
...@@ -127,6 +127,7 @@ ...@@ -127,6 +127,7 @@
'browser/ui/views/find_bar_host_interactive_uitest.cc', 'browser/ui/views/find_bar_host_interactive_uitest.cc',
'browser/ui/views/frame/browser_view_focus_uitest.cc', 'browser/ui/views/frame/browser_view_focus_uitest.cc',
'browser/ui/views/frame/browser_view_interactive_uitest.cc', 'browser/ui/views/frame/browser_view_interactive_uitest.cc',
'browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc',
'browser/ui/views/keyboard_access_browsertest.cc', 'browser/ui/views/keyboard_access_browsertest.cc',
'browser/ui/views/location_bar/star_view_browsertest.cc', 'browser/ui/views/location_bar/star_view_browsertest.cc',
'browser/ui/views/menu_controller_interactive_uitest.cc', 'browser/ui/views/menu_controller_interactive_uitest.cc',
...@@ -1477,7 +1478,6 @@ ...@@ -1477,7 +1478,6 @@
'browser/ui/views/extensions/extension_install_dialog_view_browsertest.cc', 'browser/ui/views/extensions/extension_install_dialog_view_browsertest.cc',
'browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc', 'browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc',
'browser/ui/views/frame/browser_view_browsertest.cc', 'browser/ui/views/frame/browser_view_browsertest.cc',
'browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc',
'browser/ui/views/location_bar/zoom_bubble_view_browsertest.cc', 'browser/ui/views/location_bar/zoom_bubble_view_browsertest.cc',
'browser/ui/views/profiles/avatar_menu_button_browsertest.cc', 'browser/ui/views/profiles/avatar_menu_button_browsertest.cc',
'browser/ui/views/profiles/new_avatar_menu_button_browsertest.cc', 'browser/ui/views/profiles/new_avatar_menu_button_browsertest.cc',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment