From b3ad146d98e8e67187e4f072676afbe210e73042 Mon Sep 17 00:00:00 2001 From: sadrul Date: Fri, 21 Aug 2015 12:17:36 -0700 Subject: html_viewer: Make sure window.internals is set-up correctly in layout-tests. Inject window.internals from WebFrameClient::didClearWindowObject() override instead of right after creation, since that's how //content sets it up as well. Also, fix a couple of crashes during start-up and tear-down. BUG=none Review URL: https://codereview.chromium.org/1297173002 Cr-Commit-Position: refs/heads/master@{#344833} --- content/shell/renderer/layout_test/blink_test_runner.cc | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'content/shell/renderer/layout_test/blink_test_runner.cc') diff --git a/content/shell/renderer/layout_test/blink_test_runner.cc b/content/shell/renderer/layout_test/blink_test_runner.cc index 7e23c03..a3cd68c 100644 --- a/content/shell/renderer/layout_test/blink_test_runner.cc +++ b/content/shell/renderer/layout_test/blink_test_runner.cc @@ -700,6 +700,10 @@ blink::WebPlugin* BlinkTestRunner::CreatePluginPlaceholder( return placeholder->plugin(); } +void BlinkTestRunner::OnWebTestProxyBaseDestroy( + test_runner::WebTestProxyBase* proxy) { +} + // RenderViewObserver -------------------------------------------------------- void BlinkTestRunner::DidClearWindowObject(WebLocalFrame* frame) { -- cgit v1.1