| Index: content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
|
| index 3f6695c3fd8d7569173f0a7dd721b7fa9de90b19..44f9a0138aae5946cc06ed5be3e3babcf856bb84 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
|
| @@ -42,7 +42,7 @@
|
| #include "ui/base/ui_base_types.h"
|
| #include "ui/compositor/compositor.h"
|
| #include "ui/compositor/test/draw_waiter_for_test.h"
|
| -#include "ui/compositor/test/test_context_factory.h"
|
| +#include "ui/compositor/test/in_process_context_factory.h"
|
| #include "ui/events/event.h"
|
| #include "ui/events/event_utils.h"
|
|
|
| @@ -193,10 +193,9 @@ class RenderWidgetHostViewAuraTest : public testing::Test {
|
|
|
| void SetUpEnvironment() {
|
| ImageTransportFactory::InitializeForUnitTests(
|
| - scoped_ptr<ui::ContextFactory>(new ui::TestContextFactory));
|
| + scoped_ptr<ui::ContextFactory>(new ui::InProcessContextFactory));
|
| aura_test_helper_.reset(new aura::test::AuraTestHelper(&message_loop_));
|
| - bool allow_test_contexts = true;
|
| - aura_test_helper_->SetUp(allow_test_contexts);
|
| + aura_test_helper_->SetUp();
|
|
|
| browser_context_.reset(new TestBrowserContext);
|
| process_host_ = new MockRenderProcessHost(browser_context_.get());
|
|
|