Set the window state consistently

ui/views/widget/widget_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 <algorithm>
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 989 matching lines @@
 
   // Start with something invalid to ensure it changes.
   ui::WindowShowState show_state = ui::SHOW_STATE_END;
   gfx::Rect restored_bounds;
 
   internal::NativeWidgetPrivate* native_widget =
       widget->native_widget_private();
 
   native_widget->GetWindowPlacement(&restored_bounds, &show_state);
   EXPECT_EQ(expected_bounds, restored_bounds);
-#if defined(OS_LINUX)
-  // Non-desktop/Ash widgets start off in "default" until a Restore().
-  EXPECT_EQ(ui::SHOW_STATE_DEFAULT, show_state);
-  widget->Restore();
-  native_widget->GetWindowPlacement(&restored_bounds, &show_state);
-#endif
   EXPECT_EQ(ui::SHOW_STATE_NORMAL, show_state);
 
   widget->Minimize();
   native_widget->GetWindowPlacement(&restored_bounds, &show_state);
   EXPECT_EQ(ui::SHOW_STATE_MINIMIZED, show_state);
   EXPECT_EQ(expected_bounds, restored_bounds);
 
   widget->Restore();
   native_widget->GetWindowPlacement(&restored_bounds, &show_state);
   EXPECT_EQ(ui::SHOW_STATE_NORMAL, show_state);
@@ skipping 2227 matching lines @@
   EXPECT_FALSE(widget->IsAlwaysOnTop());
   widget->SetAlwaysOnTop(true);
   EXPECT_TRUE(widget->IsAlwaysOnTop());
   widget->SetAlwaysOnTop(false);
   EXPECT_FALSE(widget->IsAlwaysOnTop());
   widget->CloseNow();
 }
 
 }  // namespace test
 }  // namespace views