summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/sessions/session_restore_uitest.cc10
-rw-r--r--chrome/test/data/purify/ui_tests.gtest.txt4
2 files changed, 6 insertions, 8 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());
}
-
diff --git a/chrome/test/data/purify/ui_tests.gtest.txt b/chrome/test/data/purify/ui_tests.gtest.txt
index dbf166d..0a62e5b 100644
--- a/chrome/test/data/purify/ui_tests.gtest.txt
+++ b/chrome/test/data/purify/ui_tests.gtest.txt
@@ -17,10 +17,6 @@ NPAPITester.ManyPlugins
# Bug: http://crbug.com/6494
SessionHistoryTest.*
-# Bug: http://crbug.com/6495
-SessionRestoreUITest.*
-
-
# Bug: http://crbug.com/6584
SSLUITest.*