diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-28 23:24:56 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-28 23:24:56 +0000 |
| commit | 23e24b435570e6df66d0e142fdb8846e7aa440a8 (patch) | |
| tree | 492a39015e25181f4758371f31a95d51d6e919fc /chrome/browser/ui/window_sizer | |
| parent | f7d1d63fecb510e5a4b53680c533eecbc7468f02 (diff) | |
| download | chromium_src-23e24b435570e6df66d0e142fdb8846e7aa440a8.zip chromium_src-23e24b435570e6df66d0e142fdb8846e7aa440a8.tar.gz chromium_src-23e24b435570e6df66d0e142fdb8846e7aa440a8.tar.bz2 | |
Reenable WindowSizerContextMenuTest.OpenBrowserUsingContextMenuOnOtherDisplay
To see this is fixed by
https://codereview.chromium.org/245443004/
BUG=346799
TBR=rsleevi@chromium.org
Review URL: https://codereview.chromium.org/205243014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266687 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/window_sizer')
| -rw-r--r-- | chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc b/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc index 4e67c6c..4637433 100644 --- a/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc +++ b/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc @@ -69,8 +69,10 @@ void OpenBrowserUsingShelfOnRootWindow(aura::Window* root_window) { #if defined(OS_WIN) #define MAYBE_OpenBrowserUsingShelfOnOtherDisplay DISABLED_OpenBrowserUsingShelfOnOtherDisplay +#define MAYBE_OpenBrowserUsingContextMenuOnOtherDisplay DISABLED_OpenBrowserUsingContextMenuOnOtherDisplay #else #define MAYBE_OpenBrowserUsingShelfOnOtherDisplay OpenBrowserUsingShelfOnOtherDisplay +#define MAYBE_OpenBrowserUsingContextMenuOnOtherDisplay OpenBrowserUsingContextMenuOnOtherDisplay #endif IN_PROC_BROWSER_TEST_F(WindowSizerTest, @@ -161,9 +163,8 @@ void OpenBrowserUsingContextMenuOnRootWindow(aura::Window* root_window) { } // namespace -// Test is flaky: http://crbug.com/346799 IN_PROC_BROWSER_TEST_F(WindowSizerContextMenuTest, - DISABLED_OpenBrowserUsingContextMenuOnOtherDisplay) { + MAYBE_OpenBrowserUsingContextMenuOnOtherDisplay) { // Don't shutdown when closing the last browser window. chrome::IncrementKeepAliveCount(); @@ -174,14 +175,14 @@ IN_PROC_BROWSER_TEST_F(WindowSizerContextMenuTest, BrowserList* browser_list = BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH); - EXPECT_EQ(1u, browser_list->size()); + ASSERT_EQ(1u, browser_list->size()); EXPECT_EQ(root_windows[0], ash::Shell::GetTargetRootWindow()); CloseBrowser(browser_list->get(0)); OpenBrowserUsingContextMenuOnRootWindow(root_windows[1]); // A new browser must be created on 2nd display. - EXPECT_EQ(1u, browser_list->size()); + ASSERT_EQ(1u, browser_list->size()); EXPECT_EQ(root_windows[1], browser_list->get(0)->window()->GetNativeWindow()->GetRootWindow()); EXPECT_EQ(root_windows[1], ash::Shell::GetTargetRootWindow()); @@ -189,7 +190,7 @@ IN_PROC_BROWSER_TEST_F(WindowSizerContextMenuTest, OpenBrowserUsingContextMenuOnRootWindow(root_windows[0]); // Next new browser must be created on 1st display. - EXPECT_EQ(2u, browser_list->size()); + ASSERT_EQ(2u, browser_list->size()); EXPECT_EQ(root_windows[0], browser_list->get(1)->window()->GetNativeWindow()->GetRootWindow()); EXPECT_EQ(root_windows[0], ash::Shell::GetTargetRootWindow()); |