| 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 a11b4e6f3a6bb31e097f85b4585ff285f0920265..61794bcef135f6e1797a2b155ff03b46fd8bc295 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
|
| @@ -14,6 +14,7 @@
|
| #include "cc/output/compositor_frame_metadata.h"
|
| #include "cc/output/copy_output_request.h"
|
| #include "content/browser/browser_thread_impl.h"
|
| +#include "content/browser/compositor/no_transport_image_transport_factory.h"
|
| #include "content/browser/compositor/resize_lock.h"
|
| #include "content/browser/renderer_host/overscroll_controller.h"
|
| #include "content/browser/renderer_host/overscroll_controller_delegate.h"
|
| @@ -48,7 +49,6 @@
|
| #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/in_process_context_factory.h"
|
| #include "ui/events/event.h"
|
| #include "ui/events/event_utils.h"
|
| #include "ui/events/gestures/gesture_configuration.h"
|
| @@ -312,11 +312,11 @@ class RenderWidgetHostViewAuraTest : public testing::Test {
|
| : browser_thread_for_ui_(BrowserThread::UI, &message_loop_) {}
|
|
|
| void SetUpEnvironment() {
|
| - ui::ContextFactory* context_factory = new ui::InProcessContextFactory;
|
| ImageTransportFactory::InitializeForUnitTests(
|
| - scoped_ptr<ui::ContextFactory>(context_factory));
|
| + new NoTransportImageTransportFactory);
|
| aura_test_helper_.reset(new aura::test::AuraTestHelper(&message_loop_));
|
| - aura_test_helper_->SetUp(context_factory);
|
| + aura_test_helper_->SetUp(
|
| + ImageTransportFactory::GetInstance()->GetContextFactory());
|
| new wm::DefaultActivationClient(aura_test_helper_->root_window());
|
|
|
| browser_context_.reset(new TestBrowserContext);
|
|
|