Commit afad6419 authored by skyostil's avatar skyostil Committed by Commit bot

Invoke LeakSanitizer on teardown of RendererAccessibilityTest

Call LeakSanitizer before RenderViewTest::TearDown(), as the latter may
leak WebKit objects when it shuts down V8.

BUG=328552,498407

Review URL: https://codereview.chromium.org/1175013002

Cr-Commit-Position: refs/heads/master@{#333746}
parent 140473b1
...@@ -51,6 +51,15 @@ class RendererAccessibilityTest : public RenderViewTest { ...@@ -51,6 +51,15 @@ class RendererAccessibilityTest : public RenderViewTest {
sink_ = &render_thread_->sink(); sink_ = &render_thread_->sink();
} }
void TearDown() override {
#if defined(LEAK_SANITIZER)
// Do this before shutting down V8 in RenderViewTest::TearDown().
// http://crbug.com/328552
__lsan_do_leak_check();
#endif
RenderViewTest::TearDown();
}
void SetMode(AccessibilityMode mode) { void SetMode(AccessibilityMode mode) {
frame()->OnSetAccessibilityMode(mode); frame()->OnSetAccessibilityMode(mode);
} }
...@@ -146,8 +155,8 @@ TEST_F(RendererAccessibilityTest, SendFullAccessibilityTreeOnReload) { ...@@ -146,8 +155,8 @@ TEST_F(RendererAccessibilityTest, SendFullAccessibilityTreeOnReload) {
EXPECT_EQ(4, CountAccessibilityNodesSentToBrowser()); EXPECT_EQ(4, CountAccessibilityNodesSentToBrowser());
} }
// http://crbug.com/253537, http://crbug.com/498407 // http://crbug.com/253537
#if defined(OS_ANDROID) || defined(OS_LINUX) #if defined(OS_ANDROID)
#define MAYBE_AccessibilityMessagesQueueWhileSwappedOut \ #define MAYBE_AccessibilityMessagesQueueWhileSwappedOut \
DISABLED_AccessibilityMessagesQueueWhileSwappedOut DISABLED_AccessibilityMessagesQueueWhileSwappedOut
#else #else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment