Fix http://crrev.com/326043002

chrome/browser/ui/panels/stacked_panel_browsertest.cc

 // Copyright (c) 2013 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 "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/panels/base_panel_browser_test.h"
 #include "chrome/browser/ui/panels/detached_panel_collection.h"
 #include "chrome/browser/ui/panels/docked_panel_collection.h"
 #include "chrome/browser/ui/panels/native_panel.h"
 #include "chrome/browser/ui/panels/panel.h"
@@ skipping 1216 matching lines @@
   ASSERT_EQ(1, panel_manager->num_panels());
   ASSERT_EQ(0, panel_manager->num_stacks());
   EXPECT_EQ(PanelCollection::DETACHED, panel3->collection()->type());
 
   panel3_expected_bounds.set_y(panel2_expected_bounds.y());
   EXPECT_EQ(panel3_expected_bounds, panel3->GetBounds());
 
   panel_manager->CloseAll();
 }
 
-IN_PROC_BROWSER_TEST_F(StackedPanelBrowserTest, FocusNextPanelOnPanelClose) {
+// Skip the test since active state might not be fully supported for some window
+// managers.
+#if defined(OS_MACOSX)
+#define MAYBE_FocusNextPanelOnPanelClose DISABLED_FocusNextPanelOnPanelClose
+#else
+#define MAYBE_FocusNextPanelOnPanelClose FocusNextPanelOnPanelClose
+#endif
+IN_PROC_BROWSER_TEST_F(StackedPanelBrowserTest,
+                       MAYBE_FocusNextPanelOnPanelClose) {
   PanelManager* panel_manager = PanelManager::GetInstance();
 
   // Create 3 stacked panels.
   StackedPanelCollection* stack = panel_manager->CreateStack();
   Panel* panel1 = CreateStackedPanel("1", gfx::Rect(100, 50, 200, 200), stack);
   Panel* panel2 = CreateStackedPanel("2", gfx::Rect(0, 0, 150, 100), stack);
   Panel* panel3 = CreateStackedPanel("3", gfx::Rect(0, 0, 150, 120), stack);
   ASSERT_EQ(3, stack->num_panels());
   ASSERT_FALSE(panel1->IsActive());
   ASSERT_FALSE(panel2->IsActive());
@@ skipping 202 matching lines @@
   EXPECT_TRUE(panel1_testing->IsWindowVisible());
   EXPECT_TRUE(panel2_testing->IsWindowVisible());
 
   // Panels' visibility should not be affected when leaving full-screen mode.
   mock_display_settings_provider()->EnableFullScreenMode(false);
   EXPECT_TRUE(panel1_testing->IsWindowVisible());
   EXPECT_TRUE(panel2_testing->IsWindowVisible());
 
   panel_manager->CloseAll();
 }