Fixes aura build on windows. Makes all tests use the test compositor

ui/aura/window_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 
 #if !defined(OS_WIN)
@@ skipping 146 matching lines @@
     canvas->GetSkCanvas()->drawColor(color_, SkXfermode::kSrc_Mode);
   }
 
  private:
   SkColor color_;
   ui::KeyboardCode last_key_code_;
 
   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);
   }
 
   Window* CreateTestWindow(SkColor color,
                            int id,
                            const gfx::Rect& bounds,
                            Window* parent) {
     return CreateTestWindowWithDelegate(new TestWindowDelegate(color),
                                         id, bounds, parent);
   }
 
   Window* CreateTestWindowWithDelegate(WindowDelegate* delegate,
                                        int id,
                                        const gfx::Rect& bounds,
                                        Window* parent) {
     Window* window = new Window(delegate);
     window->set_id(id);
     window->Init();
     window->SetBounds(bounds);
     window->Show();
     window->SetParent(parent);
     return window;
   }
 
  private:
-  MessageLoop main_message_loop;
-
   DISALLOW_COPY_AND_ASSIGN(WindowTest);
 };
 
 }  // namespace
 
 TEST_F(WindowTest, GetChildById) {
   scoped_ptr<Window> w1(CreateTestWindowWithId(1, NULL));
   scoped_ptr<Window> w11(CreateTestWindowWithId(11, w1.get()));
   scoped_ptr<Window> w111(CreateTestWindowWithId(111, w11.get()));
   scoped_ptr<Window> w12(CreateTestWindowWithId(12, w1.get()));
@@ skipping 530 matching lines @@
 
   // Dectivate w1 and make sure w2 becomes active and frontmost.
   w1->Deactivate();
   EXPECT_FALSE(w1->IsActive());
   EXPECT_TRUE(w2->IsActive());
   EXPECT_EQ(w2.get(), parent->children()[1]);
 }
 
 }  // namespace internal
 }  // namespace aura