Mac Aura fails compile and some tests

ash/wm/compact_layout_manager_unittest.cc

 // Copyright (c) 2012 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 "ash/wm/compact_layout_manager.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/shelf_layout_manager.h"
@@ skipping 105 matching lines @@
   window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MAXIMIZED);
   EXPECT_TRUE(widget->IsVisible());
   window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL);
   EXPECT_TRUE(widget->IsVisible());
   window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_FULLSCREEN);
   EXPECT_FALSE(widget->IsVisible());
   window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL);
   EXPECT_TRUE(widget->IsVisible());
 }
 
-TEST_F(CompactLayoutManagerTest, TransitionTest) {
+#if defined(OS_MACOSX)
+#define MAYBE_TransitionTest FAILS_TransitionTest
+#else
+#define MAYBE_TransitionTest TransitionTest
+#endif
+TEST_F(CompactLayoutManagerTest, MAYBE_TransitionTest) {
   // Assert on viewport size to be the host size.
   ASSERT_EQ(kMaxWidth, default_container_layer_width());
   // Create 3 windows, check that the layer grow as each one is added
   // to the layout.
   aura::Window* window1 = CreateNormalWindow(0);
   EXPECT_EQ(kMaxWidth, default_container_layer_width());
   aura::Window* window2 = CreateNormalWindow(1);
   EXPECT_EQ(kMaxWidth * 2, default_container_layer_width());
   aura::Window* window3 = CreateNormalWindow(2);
   EXPECT_EQ(kMaxWidth * 3, default_container_layer_width());
@@ skipping 81 matching lines @@
   delete window1;
   delete window2;
   delete window3;
 
   // No current window now.
   EXPECT_EQ(NULL, layout_manager_->current_window_);
 }
 
 }  // namespace internal
 }  // namespace ash