diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-12 02:29:49 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-12 02:29:49 +0000 |
| commit | b5110bcd688f2d19b48af67e255273be2b94e68b (patch) | |
| tree | 376a9fdbdbad5e4bddfe0a305b2d634228226569 /chrome | |
| parent | c78820ce8acbe61d0059586dd9cd9c4084a68eb9 (diff) | |
| download | chromium_src-b5110bcd688f2d19b48af67e255273be2b94e68b.zip chromium_src-b5110bcd688f2d19b48af67e255273be2b94e68b.tar.gz chromium_src-b5110bcd688f2d19b48af67e255273be2b94e68b.tar.bz2 | |
Fix leak in my interstitial page test.
Re-enable leaky web_contents_unittest.cc interstitial test.
Remove purify suppressions for leaky test.
BUG=http://crbug.com/13937
Review URL: http://codereview.chromium.org/125033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18246 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/renderer_host/test_render_view_host.h | 2 | ||||
| -rw-r--r-- | chrome/browser/tab_contents/web_contents_unittest.cc | 2 | ||||
| -rw-r--r-- | chrome/test/data/purify/unit_tests.exe_MLK.txt | 13 |
3 files changed, 2 insertions, 15 deletions
diff --git a/chrome/browser/renderer_host/test_render_view_host.h b/chrome/browser/renderer_host/test_render_view_host.h index cadcc1b..ac80096 100644 --- a/chrome/browser/renderer_host/test_render_view_host.h +++ b/chrome/browser/renderer_host/test_render_view_host.h @@ -67,7 +67,7 @@ class TestRenderWidgetHostView : public RenderWidgetHostView { virtual void IMEUpdateStatus(int control, const gfx::Rect& caret_rect) {} virtual void DidPaintRect(const gfx::Rect& rect) {} virtual void DidScrollRect(const gfx::Rect& rect, int dx, int dy) {} - virtual void RenderViewGone() {} + virtual void RenderViewGone() { delete this; } virtual void Destroy() {} virtual void PrepareToDestroy() {} virtual void SetTooltipText(const std::wstring& tooltip_text) {} diff --git a/chrome/browser/tab_contents/web_contents_unittest.cc b/chrome/browser/tab_contents/web_contents_unittest.cc index 53da8fb..5a228ac 100644 --- a/chrome/browser/tab_contents/web_contents_unittest.cc +++ b/chrome/browser/tab_contents/web_contents_unittest.cc @@ -937,7 +937,7 @@ TEST_F(TabContentsTest, ShowInterstitialThenGoBack) { // Test navigating to a page that shows an interstitial, has a renderer crash, // and then goes back. // http://crbug.com/13937: Disabling because it's leaky on win/mac. -TEST_F(TabContentsTest, DISABLED_ShowInterstitialCrashRendererThenGoBack) { +TEST_F(TabContentsTest, ShowInterstitialCrashRendererThenGoBack) { // Navigate to a page so we have a navigation entry in the controller. GURL url1("http://www.google.com"); rvh()->SendNavigate(1, url1); diff --git a/chrome/test/data/purify/unit_tests.exe_MLK.txt b/chrome/test/data/purify/unit_tests.exe_MLK.txt index 7b47088..e69de29 100644 --- a/chrome/test/data/purify/unit_tests.exe_MLK.txt +++ b/chrome/test/data/purify/unit_tests.exe_MLK.txt @@ -1,13 +0,0 @@ -# See bug 13937 -Alloc Location - ... - chrome/browser/renderer_host/test_render_view_host.cc:18 TestRenderViewHost::TestRenderViewHost(SiteInstance *,RenderViewHostDelegate *,int,WaitableEvent::base *) - chrome/browser/renderer_host/test_render_view_host.h:166 TestRenderViewHostFactory::CreateRenderViewHost(SiteInstance *,RenderViewHostDelegate *,int,WaitableEvent::base *) - chrome/browser/renderer_host/render_view_host_factory.cc:21 RenderViewHostFactory::Create(SiteInstance *,RenderViewHostDelegate *,int,WaitableEvent::base *) - chrome/browser/tab_contents/render_view_host_manager.cc:60 RenderViewHostManager::Init(Profile *,SiteInstance *,int,WaitableEvent::base *) - chrome/browser/tab_contents/tab_contents.cc:258 TabContents::TabContents(Profile *,SiteInstance *,int,WaitableEvent::base *) - chrome/browser/tab_contents/test_web_contents.cc:11 TestTabContents::TestTabContents(Profile *,SiteInstance *) - chrome/browser/renderer_host/test_render_view_host.cc:85 RenderViewHostTestHarness::SetUp(void) - chrome/browser/tab_contents/web_contents_unittest.cc:199 TabContentsTest::SetUp(void) - testing/gtest/src/gtest.cc:2020 testing::Test::Run(void) - ^^^ |