| Index: ui/aura/window_unittest.cc
|
| diff --git a/ui/aura/window_unittest.cc b/ui/aura/window_unittest.cc
|
| index 87f7ca945b52ae04a5b591b539ba22ca568ed85f..65a6af2e0ec6bb859dc27364c513c0ca97d48613 100644
|
| --- a/ui/aura/window_unittest.cc
|
| +++ b/ui/aura/window_unittest.cc
|
| @@ -4,8 +4,8 @@
|
|
|
| #include "base/basictypes.h"
|
| #include "base/compiler_specific.h"
|
| -#include "base/message_loop.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| +#include "ui/aura/aura_test_base.h"
|
| #include "ui/aura/desktop.h"
|
| #include "ui/aura/event.h"
|
| #include "ui/aura/focus_manager.h"
|
| @@ -172,23 +172,11 @@ class TestWindowDelegate : public WindowDelegateImpl {
|
| DISALLOW_COPY_AND_ASSIGN(TestWindowDelegate);
|
| };
|
|
|
| -class WindowTest : public testing::Test {
|
| +class WindowTest : public AuraTestBase {
|
| public:
|
| - WindowTest() : main_message_loop(MessageLoop::TYPE_UI) {
|
| - Desktop::GetInstance()->Show();
|
| - Desktop::GetInstance()->SetSize(gfx::Size(500, 500));
|
| - if (!Desktop::GetInstance()->default_parent())
|
| - Desktop::GetInstance()->CreateDefaultParentForTesting();
|
| - }
|
| + WindowTest() {}
|
| virtual ~WindowTest() {}
|
|
|
| - // Overridden from testing::Test:
|
| - virtual void SetUp() OVERRIDE {
|
| - }
|
| -
|
| - virtual void TearDown() OVERRIDE {
|
| - }
|
| -
|
| Window* CreateTestWindowWithId(int id, Window* parent) {
|
| return CreateTestWindowWithDelegate(NULL, id, gfx::Rect(), parent);
|
| }
|
| @@ -215,8 +203,6 @@ class WindowTest : public testing::Test {
|
| }
|
|
|
| private:
|
| - MessageLoop main_message_loop;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(WindowTest);
|
| };
|
|
|
|
|