Index: content/public/test/test_renderer_host.cc |
diff --git a/content/public/test/test_renderer_host.cc b/content/public/test/test_renderer_host.cc |
index e9e41ab06921b2fd39dc8a11e7be8b63eff51e6d..a7ff602e3653a3139832b0ea55c51be3b4e9f53e 100644 |
--- a/content/public/test/test_renderer_host.cc |
+++ b/content/public/test/test_renderer_host.cc |
@@ -38,6 +38,10 @@ |
#include "ui/wm/core/default_activation_client.h" |
#endif |
+#if defined(OS_MACOSX) |
+#include "ui/accelerated_widget_mac/window_resize_helper_mac.h" |
+#endif |
+ |
namespace content { |
// RenderFrameHostTester ------------------------------------------------------ |
@@ -214,6 +218,11 @@ void RenderViewHostTestHarness::SetUp() { |
if (IsBrowserSideNavigationEnabled()) |
BrowserSideNavigationSetUp(); |
+ |
+#if defined(OS_MACOSX) |
+ ui::WindowResizeHelperMac::Get()->Init( |
+ base::MessageLoop::current()->task_runner()); |
+#endif // OS_MACOSX |
} |
void RenderViewHostTestHarness::TearDown() { |
@@ -229,6 +238,10 @@ void RenderViewHostTestHarness::TearDown() { |
// before we destroy the browser context. |
base::RunLoop().RunUntilIdle(); |
+#if defined(OS_MACOSX) |
+ ui::WindowResizeHelperMac::Get()->ShutdownForTests(); |
+#endif // OS_MACOSX |
+ |
#if defined(OS_WIN) |
ole_initializer_.reset(); |
#endif |