| Index: content/browser/media/capture/desktop_capture_device_aura_unittest.cc
|
| diff --git a/content/browser/media/capture/desktop_capture_device_aura_unittest.cc b/content/browser/media/capture/desktop_capture_device_aura_unittest.cc
|
| index 99577d6f8a34e912df088e2a1864e7f0b4edcb4d..6502339fc7e32338d0161422809b7ca428bb1a09 100644
|
| --- a/content/browser/media/capture/desktop_capture_device_aura_unittest.cc
|
| +++ b/content/browser/media/capture/desktop_capture_device_aura_unittest.cc
|
| @@ -11,10 +11,10 @@
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| #include "ui/aura/client/window_tree_client.h"
|
| -#include "ui/aura/test/aura_test_helper.h"
|
| #include "ui/aura/test/test_window_delegate.h"
|
| #include "ui/aura/window.h"
|
| #include "ui/compositor/test/context_factories_for_test.h"
|
| +#include "ui/wm/test/wm_test_helper.h"
|
|
|
| using ::testing::_;
|
| using ::testing::AnyNumber;
|
| @@ -63,7 +63,7 @@ class DesktopCaptureDeviceAuraTest : public testing::Test {
|
| // The ContextFactory must exist before any Compositors are created.
|
| bool enable_pixel_output = false;
|
| ui::InitializeContextFactoryForTests(enable_pixel_output);
|
| - helper_.reset(new aura::test::AuraTestHelper(&message_loop_));
|
| + helper_.reset(new wm::WMTestHelper);
|
| helper_->SetUp();
|
|
|
| // We need a window to cover desktop area so that DesktopCaptureDeviceAura
|
| @@ -93,7 +93,7 @@ class DesktopCaptureDeviceAuraTest : public testing::Test {
|
| private:
|
| base::MessageLoopForUI message_loop_;
|
| BrowserThreadImpl browser_thread_for_ui_;
|
| - scoped_ptr<aura::test::AuraTestHelper> helper_;
|
| + scoped_ptr<wm::WMTestHelper> helper_;
|
| scoped_ptr<aura::Window> desktop_window_;
|
| scoped_ptr<aura::test::TestWindowDelegate> window_delegate_;
|
|
|
|
|