diff options
| author | mlloyd@chromium.org <mlloyd@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-20 21:03:51 +0000 |
|---|---|---|
| committer | mlloyd@chromium.org <mlloyd@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-20 21:03:51 +0000 |
| commit | 81f7decdeb735239f75b0c6c3a1624ec6a1e2f80 (patch) | |
| tree | a909ba7b38174ab38c98c0e5915d07d81c7e6244 /chrome/browser/tab_restore_uitest.cc | |
| parent | 176e7f48e77b95ca38cd5c34846eabdb3eec8570 (diff) | |
| download | chromium_src-81f7decdeb735239f75b0c6c3a1624ec6a1e2f80.zip chromium_src-81f7decdeb735239f75b0c6c3a1624ec6a1e2f80.tar.gz chromium_src-81f7decdeb735239f75b0c6c3a1624ec6a1e2f80.tar.bz2 | |
Mark RestoreWithExistingSiteInstance as flaky on all platforms.
BUG=55380
TEST=
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59975 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_restore_uitest.cc')
| -rw-r--r-- | chrome/browser/tab_restore_uitest.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/chrome/browser/tab_restore_uitest.cc b/chrome/browser/tab_restore_uitest.cc index bfb1ad2a..a8a13e6 100644 --- a/chrome/browser/tab_restore_uitest.cc +++ b/chrome/browser/tab_restore_uitest.cc @@ -507,13 +507,8 @@ TEST_F(TabRestoreUITest, MAYBE_RestoreWithExistingSiteInstance) { // Tests that the SiteInstances used for entries in a restored tab's history // are given appropriate max page IDs, even if the renderer for the entry // already exists. (Bug 1204135) -#if defined(OS_WIN) -// http://crbug.com/55380 - NavigateToURL to making this flaky -#define MAYBE_RestoreCrossSiteWithExistingSiteInstance FLAKY_RestoreCrossSiteWithExistingSiteInstance -#else -#define MAYBE_RestoreCrossSiteWithExistingSiteInstance RestoreCrossSiteWithExistingSiteInstance -#endif -TEST_F(TabRestoreUITest, MAYBE_RestoreCrossSiteWithExistingSiteInstance) { +// http://crbug.com/55380 - NavigateToURL to making this flaky on all platforms +TEST_F(TabRestoreUITest, FLAKY_RestoreCrossSiteWithExistingSiteInstance) { net::TestServer test_server(net::TestServer::TYPE_HTTP, FilePath(FILE_PATH_LITERAL("chrome/test/data"))); ASSERT_TRUE(test_server.Start()); |