diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-11 17:54:59 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-11 17:54:59 +0000 |
| commit | cb2267448bfd698b6d7f1d7c2efd4fd220a4b37a (patch) | |
| tree | 2e2a7c04c56f31344b5c96f92d35135a2f7d4e87 /chrome | |
| parent | 9d6b9affe59b28dba4061cec771a65d28d8635a9 (diff) | |
| download | chromium_src-cb2267448bfd698b6d7f1d7c2efd4fd220a4b37a.zip chromium_src-cb2267448bfd698b6d7f1d7c2efd4fd220a4b37a.tar.gz chromium_src-cb2267448bfd698b6d7f1d7c2efd4fd220a4b37a.tar.bz2 | |
TBR: sky@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34353 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/sessions/session_restore_uitest.cc | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/chrome/browser/sessions/session_restore_uitest.cc b/chrome/browser/sessions/session_restore_uitest.cc index d2784023..82d5692 100644 --- a/chrome/browser/sessions/session_restore_uitest.cc +++ b/chrome/browser/sessions/session_restore_uitest.cc @@ -86,6 +86,16 @@ class SessionRestoreUITest : public UITest { DISALLOW_COPY_AND_ASSIGN(SessionRestoreUITest); }; +#if defined(OS_LINUX) && defined(TOOLKIT_VIEWS) +// This test is flaky on linux/views builds. +// See http://crbug.com/28808. +#define NormalAndPopup FLAKY_NormalAndPopup +#define Basic FLAKY_Basic +#define TwoTabsSecondSelected FLAKY_TwoTabsSecondSelected +#define RestoresForwardAndBackwardNavs FLAKY_RestoresForwardAndBackwardNavs +#endif + + TEST_F(SessionRestoreUITest, Basic) { NavigateToURL(url1_); NavigateToURL(url2_); @@ -254,12 +264,6 @@ TEST_F(SessionRestoreUITest, ClosedTabStaysClosed) { ASSERT_TRUE(GetActiveTabURL() == url1_); } -#if defined(OS_LINUX) && defined(TOOLKIT_VIEWS) -// This test is flaky on linux/views builds. -// See http://crbug.com/28808. -#define NormalAndPopup FLAKY_NormalAndPopup -#endif - // Creates a tabbed browser and popup and makes sure we restore both. TEST_F(SessionRestoreUITest, NormalAndPopup) { if (!browser_defaults::kRestorePopups) |