cros: Remove some OS platform ifdefs from ash

ash/wm/window_positioner_unittest.cc

 // Copyright 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 "ash/common/wm/window_positioner.h"
 
 #include <string>
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/scoped_root_window_for_new_windows.h"
@@ skipping 35 matching lines @@
   params.can_resize = true;
   params.can_maximize = true;
   views::Widget* widget = shell::ToplevelWindow::CreateToplevelWindow(params);
   EXPECT_EQ(gfx::Rect(400, 0, 500, 453 + height_offset).ToString(),
             widget->GetWindowBoundsInScreen().ToString());
 }
 
 TEST_P(WindowPositionerTest, OpenDefaultWindowOnSecondDisplay) {
   if (!SupportsMultipleDisplays())
     return;
-#if defined(OS_WIN)
-  ash::WindowPositioner::SetMaximizeFirstWindow(true);
-#endif
+
   UpdateDisplay("400x400,1400x900");
   WmWindow* second_root_window = WmShell::Get()->GetAllRootWindows()[1];
   ScopedRootWindowForNewWindows root_for_new_windows(second_root_window);
   shell::ToplevelWindow::CreateParams params;
   params.can_resize = true;
   params.can_maximize = true;
   views::Widget* widget = shell::ToplevelWindow::CreateToplevelWindow(params);
   gfx::Rect bounds = widget->GetWindowBoundsInScreen();
-#if defined(OS_WIN)
-  EXPECT_TRUE(widget->IsMaximized());
-#else
+
   // The window should be in the 2nd display with the default size.
   EXPECT_EQ("300x300", bounds.size().ToString());
-#endif
-
   EXPECT_TRUE(
       second_root_window->GetDisplayNearestWindow().bounds().Contains(bounds));
 }
 
 // Tests that second window inherits first window's maximized state as well as
 // its restore bounds.
-// TODO(msw): Broken on Windows. http://crbug.com/584038
-#if defined(OS_CHROMEOS)
 TEST_P(WindowPositionerTest, SecondMaximizedWindowHasProperRestoreSize) {
   const int height_offset = GetMdMaximizedWindowHeightOffset();
   UpdateDisplay("1400x900");
   shell::ToplevelWindow::CreateParams params;
   params.can_resize = true;
   params.can_maximize = true;
   views::Widget* widget1 = shell::ToplevelWindow::CreateToplevelWindow(params);
   gfx::Rect bounds = widget1->GetWindowBoundsInScreen();
 
   // The window should have default size.
@@ skipping 14 matching lines @@
   bounds = widget2->GetWindowBoundsInScreen();
   EXPECT_TRUE(widget2->IsMaximized());
   EXPECT_EQ(gfx::Rect(0, 0, 1400, 853 + height_offset).ToString(),
             bounds.ToString());
 
   widget2->Restore();
   // Second window's restored size should be set to default size.
   bounds = widget2->GetWindowBoundsInScreen();
   EXPECT_EQ("300x300", bounds.size().ToString());
 }
-#endif  // defined(OS_CHROMEOS)
 
 namespace {
 
 // A WidgetDelegate that returns the out of display saved bounds.
 class OutOfDisplayDelegate : public views::WidgetDelegate {
  public:
   explicit OutOfDisplayDelegate(views::Widget* widget) : widget_(widget) {}
   ~OutOfDisplayDelegate() override {}
 
   // Overridden from WidgetDelegate:
@@ skipping 101 matching lines @@
   widget1->SetFullscreen(false);
   ASSERT_EQ("300x300", widget1->GetWindowBoundsInScreen().size().ToString());
 
   // Closing 2nd widget triggers the rearrange logic but the 1st
   // widget should stay in the current size.
   widget2->CloseNow();
   ASSERT_EQ("300x300", widget1->GetWindowBoundsInScreen().size().ToString());
 }
 
 }  // namespace ash