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

ui/gfx/compositor/layer_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/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/compositor/compositor_observer.h"
@@ skipping 149 matching lines @@
  private:
   // Overridden from LayerDelegate:
   virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE {
   }
 
   DISALLOW_COPY_AND_ASSIGN(NullLayerDelegate);
 };
 
 }
 
-TEST_F(LayerWithRealCompositorTest, Draw) {
+#if defined(OS_WIN)
+// These are disabled on windows as they don't run correctly on the buildbot.
+// Reenable once we move to the real compositor.
+#define MAYBE_Draw DISABLED_Draw
+#define MAYBE_Hierarchy DISABLED_Hierarchy
+#else
+#define MAYBE_Draw Draw
+#define MAYBE_Hierarchy Hierarchy
+#endif
+
+TEST_F(LayerWithRealCompositorTest, MAYBE_Draw) {
   scoped_ptr<Layer> layer(CreateColorLayer(SK_ColorRED,
                                            gfx::Rect(20, 20, 50, 50)));
   DrawTree(layer.get());
 }
 
 // Create this hierarchy:
 // L1 - red
 // +-- L2 - blue
 // |   +-- L3 - yellow
 // +-- L4 - magenta
 //
-TEST_F(LayerWithRealCompositorTest, Hierarchy) {
+TEST_F(LayerWithRealCompositorTest, MAYBE_Hierarchy) {
   scoped_ptr<Layer> l1(CreateColorLayer(SK_ColorRED,
                                         gfx::Rect(20, 20, 400, 400)));
   scoped_ptr<Layer> l2(CreateColorLayer(SK_ColorBLUE,
                                         gfx::Rect(10, 10, 350, 350)));
   scoped_ptr<Layer> l3(CreateColorLayer(SK_ColorYELLOW,
                                         gfx::Rect(5, 5, 25, 25)));
   scoped_ptr<Layer> l4(CreateColorLayer(SK_ColorMAGENTA,
                                         gfx::Rect(300, 300, 100, 100)));
 
   l1->Add(l2.get());
@@ skipping 458 matching lines @@
   EXPECT_FALSE(l2->IsDrawn());
   EXPECT_FALSE(l3->IsDrawn());
 
   l1->SetVisible(true);
   EXPECT_TRUE(l1->IsDrawn());
   EXPECT_TRUE(l2->IsDrawn());
   EXPECT_FALSE(l3->IsDrawn());
 }
 
 } // namespace ui