summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorsky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-18 23:30:19 +0000
committersky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-18 23:30:19 +0000
commit27866a0b950ded8afb87120628af72dfd0b3582d (patch)
tree0ce3f5da9a701aa2f1f63d1c9c3d249c4716b434 /chrome/browser
parent46a8b615acd3352a28c8fbc14f9fe53d30ff919a (diff)
downloadchromium_src-27866a0b950ded8afb87120628af72dfd0b3582d.zip
chromium_src-27866a0b950ded8afb87120628af72dfd0b3582d.tar.gz
chromium_src-27866a0b950ded8afb87120628af72dfd0b3582d.tar.bz2
Renables the session restore ui tests in hopes of finding out why they
are flakey. I'll watch the bot to see where they are failing after landing. Also fixes leaks in the tests I noticed when run under Purify. BUG=6495 TEST=none Review URL: http://codereview.chromium.org/20477 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9991 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/sessions/session_restore_uitest.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/chrome/browser/sessions/session_restore_uitest.cc b/chrome/browser/sessions/session_restore_uitest.cc
index 7713b83..737f239 100644
--- a/chrome/browser/sessions/session_restore_uitest.cc
+++ b/chrome/browser/sessions/session_restore_uitest.cc
@@ -117,7 +117,8 @@ TEST_F(SessionRestoreUITest, RestoresForwardAndBackwardNavs) {
NavigateToURL(url2);
NavigateToURL(url3);
- ASSERT_TRUE(GetActiveTab()->GoBack());
+ scoped_ptr<TabProxy> active_tab(GetActiveTab());
+ ASSERT_TRUE(active_tab->GoBack());
QuitBrowserAndRestore();
@@ -154,7 +155,8 @@ TEST_F(SessionRestoreUITest, RestoresCrossSiteForwardAndBackwardNavs) {
NavigateToURL(cross_site_url);
NavigateToURL(url2);
- ASSERT_TRUE(GetActiveTab()->GoBack());
+ scoped_ptr<TabProxy> active_tab(GetActiveTab());
+ ASSERT_TRUE(active_tab->GoBack());
QuitBrowserAndRestore();
@@ -241,7 +243,8 @@ TEST_F(SessionRestoreUITest, ClosedTabStaysClosed) {
browser_proxy->AppendTab(url2);
- browser_proxy->GetActiveTab()->Close(true);
+ scoped_ptr<TabProxy> active_tab(browser_proxy->GetActiveTab());
+ active_tab->Close(true);
QuitBrowserAndRestore();
browser_proxy.reset();
@@ -428,4 +431,3 @@ TEST_F(SessionRestoreUITest, DISABLED_ShareProcessesOnRestore) {
ASSERT_EQ(expected_process_count, GetBrowserProcessCount());
}
-