chromeos: converts WindowState to aura::Window

chrome/browser/ui/ash/accelerator_commands_browsertest.cc

Index: chrome/browser/ui/ash/accelerator_commands_browsertest.cc
diff --git a/chrome/browser/ui/ash/accelerator_commands_browsertest.cc b/chrome/browser/ui/ash/accelerator_commands_browsertest.cc
index 44fb02393d6d5247b04aa64e5dc03c27855a2b6b..4b13aa033d881adb6f7a4c15aeaf5f59c9db6391 100644
--- a/chrome/browser/ui/ash/accelerator_commands_browsertest.cc
+++ b/chrome/browser/ui/ash/accelerator_commands_browsertest.cc
@@ -7,7 +7,6 @@
 #include "ash/accelerators/accelerator_commands_aura.h"
 #include "ash/shell.h"
 #include "ash/wm/window_state.h"
-#include "ash/wm_window.h"
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "build/build_config.h"
@@ -22,6 +21,7 @@
 #include "extensions/browser/app_window/native_app_window.h"
 #include "services/ui/public/interfaces/window_manager_constants.mojom.h"
 #include "ui/aura/client/aura_constants.h"
+#include "ui/aura/window.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
@@ -72,8 +72,7 @@ IN_PROC_BROWSER_TEST_F(AcceleratorCommandsBrowserTest, ToggleMaximized) {
 
   // When in fullscreen accelerators::ToggleMaximized gets out of fullscreen.
   EXPECT_FALSE(window_state->IsFullscreen());
-  Browser* browser = chrome::FindBrowserWithWindow(
-      ash::WmWindow::GetAuraWindow(window_state->window()));
+  Browser* browser = chrome::FindBrowserWithWindow(window_state->window());
   ASSERT_TRUE(browser);
   chrome::ToggleFullscreenMode(browser);
   EXPECT_TRUE(window_state->IsFullscreen());
@@ -139,9 +138,8 @@ IN_PROC_BROWSER_TEST_P(AcceleratorCommandsFullscreenBrowserTest,
 
   // 2) ToggleFullscreen() should have no effect on windows which cannot be
   // maximized.
-  ash::WmWindow::GetAuraWindow(window_state->window())
-      ->SetProperty(aura::client::kResizeBehaviorKey,
-                    ui::mojom::kResizeBehaviorNone);
+  window_state->window()->SetProperty(aura::client::kResizeBehaviorKey,
+                                      ui::mojom::kResizeBehaviorNone);
   ash::accelerators::ToggleFullscreen();
   EXPECT_TRUE(IsInitialShowState(window_state));