Revert of Remove remaining window states where window is shown with opacity 0.

ash/wm/panels/panel_layout_manager_unittest.cc

Index: ash/wm/panels/panel_layout_manager_unittest.cc
diff --git a/ash/wm/panels/panel_layout_manager_unittest.cc b/ash/wm/panels/panel_layout_manager_unittest.cc
index 6bf85b4c4603422b22ec5cf97c26c2c10135b9be..d32eb82922332e2e5baf736e53bcd4af8e8a1afe 100644
--- a/ash/wm/panels/panel_layout_manager_unittest.cc
+++ b/ash/wm/panels/panel_layout_manager_unittest.cc
@@ -23,7 +23,6 @@
 #include "ash/test/shell_test_api.h"
 #include "ash/test/test_shelf_delegate.h"
 #include "ash/wm/mru_window_tracker.h"
-#include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ -68,6 +67,9 @@
     test::TestShelfDelegate* shelf_delegate =
         test::TestShelfDelegate::instance();
     shelf_delegate->AddShelfItem(window);
+    PanelLayoutManager* manager = static_cast<PanelLayoutManager*>(
+        GetPanelContainer(window)->layout_manager());
+    manager->Relayout();
     shelf_view_test()->RunMessageLoopUntilAnimationsDone();
     return window;
   }
@@ -575,12 +577,12 @@
   RunAllPendingInMessageLoop();
   EXPECT_TRUE(IsPanelCalloutVisible(window.get()));
   // Minimize the panel, callout should be hidden.
-  wm::GetWindowState(window.get())->Minimize();
+  window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MINIMIZED);
   RunAllPendingInMessageLoop();
   EXPECT_FALSE(IsPanelCalloutVisible(window.get()));
-  // Restore the panel; panel should not be activated by default but callout
+  // Restore the pantel; panel should not be activated by default but callout
   // should be visible.
-  wm::GetWindowState(window.get())->Unminimize();
+  window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL);
   RunAllPendingInMessageLoop();
   EXPECT_TRUE(IsPanelCalloutVisible(window.get()));
   // Activate the window, ensure callout is visible.
@@ -748,7 +750,7 @@
   scoped_ptr<aura::Window> w2(CreatePanelWindow(bounds));
   scoped_ptr<aura::Window> w3;
   // Minimize w2.
-  wm::GetWindowState(w2.get())->Minimize();
+  w2->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MINIMIZED);
   RunAllPendingInMessageLoop();
   EXPECT_TRUE(w1->IsVisible());
   EXPECT_FALSE(w2->IsVisible());