| Index: content/browser/renderer_host/render_widget_host_unittest.cc
|
| diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc
|
| index 967c8142715357ee3a4a89fb9df1e1dee6228ac4..cd3abedd6c29ae43ad9ca102b2907bf52bde48f5 100644
|
| --- a/content/browser/renderer_host/render_widget_host_unittest.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_unittest.cc
|
| @@ -35,9 +35,11 @@
|
| #include "ui/gfx/screen.h"
|
|
|
| #if defined(USE_AURA)
|
| +#include "content/browser/aura/image_transport_factory.h"
|
| #include "content/browser/renderer_host/render_widget_host_view_aura.h"
|
| #include "ui/aura/env.h"
|
| #include "ui/aura/test/test_screen.h"
|
| +#include "ui/compositor/test/test_context_factory.h"
|
| #endif
|
|
|
| #if defined(OS_WIN) || defined(USE_AURA)
|
| @@ -618,6 +620,8 @@ class RenderWidgetHostTest : public testing::Test {
|
| delegate_.reset(new MockRenderWidgetHostDelegate());
|
| process_ = new RenderWidgetHostProcess(browser_context_.get());
|
| #if defined(USE_AURA)
|
| + ImageTransportFactory::InitializeForUnitTests(
|
| + scoped_ptr<ui::ContextFactory>(new ui::TestContextFactory));
|
| aura::Env::CreateInstance();
|
| screen_.reset(aura::TestScreen::Create());
|
| gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen_.get());
|
| @@ -638,6 +642,7 @@ class RenderWidgetHostTest : public testing::Test {
|
| #if defined(USE_AURA)
|
| aura::Env::DeleteInstance();
|
| screen_.reset();
|
| + ImageTransportFactory::Terminate();
|
| #endif
|
|
|
| // Process all pending tasks to avoid leaks.
|
|
|