diff options
| author | kjellander <kjellander@chromium.org> | 2015-06-11 01:15:54 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-11 08:16:31 +0000 |
| commit | 8ca72d1504c20967ec2693ec453a5f13ae0926cf (patch) | |
| tree | 682bff9c2ea07672797a7c631e379a325acec23b | |
| parent | 5431c3ac9664478d98ad3b4ff3e5fa3504a814a1 (diff) | |
| download | chromium_src-8ca72d1504c20967ec2693ec453a5f13ae0926cf.zip chromium_src-8ca72d1504c20967ec2693ec453a5f13ae0926cf.tar.gz chromium_src-8ca72d1504c20967ec2693ec453a5f13ae0926cf.tar.bz2 | |
Disable OmniboxViewTest.PopupAccelerators on Win XP.
BUG=499155
TBR=tapted@chromium.org
Review URL: https://codereview.chromium.org/1178643003
Cr-Commit-Position: refs/heads/master@{#333908}
| -rw-r--r-- | chrome/browser/ui/omnibox/omnibox_view_browsertest.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc index 2083426..ef63966 100644 --- a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc +++ b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc @@ -49,6 +49,11 @@ #include "ui/events/keycodes/keyboard_codes.h" #include "ui/gfx/geometry/point.h" +// For fine-grained suppression on flaky tests. +#if defined(OS_WIN) +#include "base/win/windows_version.h" +#endif + using base::ASCIIToUTF16; using base::UTF16ToUTF8; using base::Time; @@ -448,6 +453,11 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_BrowserAccelerators) { #endif IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_PopupAccelerators) { +#if defined(OS_WIN) + // Flaky on XP bot. http://crbug.com/499155 + if (base::win::GetVersion() <= base::win::VERSION_XP) + return; +#endif // Create a popup. Browser* popup = CreateBrowserForPopup(browser()->profile()); ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(popup)); |