Converts ash to use aura-mus

ash/mus/accelerators/accelerator_controller_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 "ash/common/accelerators/accelerator_controller.h"
 
 #include "ash/common/accelerators/accelerator_table.h"
 #include "ash/common/accessibility_delegate.h"
 #include "ash/common/accessibility_types.h"
 #include "ash/common/ime_control_delegate.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/system/brightness_control_delegate.h"
 #include "ash/common/system/keyboard_brightness_control_delegate.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/test/ash_test.h"
 #include "ash/common/wm/panels/panel_layout_manager.h"
 #include "ash/common/wm/window_positioning_utils.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm/wm_event.h"
 #include "ash/common/wm_lookup.h"
 #include "ash/common/wm_root_window_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/mus/accelerators/accelerator_controller_registrar_test_api.h"
 #include "ash/mus/bridge/wm_shell_mus_test_api.h"
 #include "ash/mus/bridge/wm_window_mus.h"
 #include "ash/mus/property_util.h"
 #include "ash/mus/test/wm_test_base.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "base/test/user_action_tester.cc"
+#include "services/ui/public/interfaces/window_manager.mojom.h"
+#include "ui/aura/client/aura_constants.h"
+#include "ui/aura/window.h"
 #include "ui/events/event.h"
 #include "ui/events/event_processor.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/message_center/message_center.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(USE_X11)
 #include <X11/Xlib.h>
 #include "ui/events/test/events_test_utils_x11.h"
 #endif
@@ skipping 382 matching lines @@
   const ui::Accelerator accelerator_shift_a(ui::VKEY_A, ui::EF_SHIFT_DOWN);
   TestTarget target;
   GetController()->Register(accelerator_a, &target);
   EXPECT_TRUE(GetController()->IsRegistered(accelerator_a));
   EXPECT_FALSE(GetController()->IsRegistered(accelerator_shift_a));
   GetController()->UnregisterAll(&target);
   EXPECT_FALSE(GetController()->IsRegistered(accelerator_a));
 }
 
 TEST_F(AcceleratorControllerTest, WindowSnap) {
-  ui::Window* ui_window = CreateTestWindow(gfx::Rect(5, 5, 20, 20));
-  WmWindow* window = mus::WmWindowMus::Get(ui_window);
+  aura::Window* aura_window = CreateTestWindow(gfx::Rect(5, 5, 20, 20));
+  WmWindow* window = mus::WmWindowMus::Get(aura_window);
   wm::WindowState* window_state = window->GetWindowState();
 
   window_state->Activate();
 
   {
     GetController()->PerformActionIfEnabled(WINDOW_CYCLE_SNAP_DOCK_LEFT);
     gfx::Rect expected_bounds =
         wm::GetDefaultLeftSnappedWindowBoundsInParent(window);
     EXPECT_EQ(expected_bounds.ToString(), window->GetBounds().ToString());
   }
@@ skipping 286 matching lines @@
 
 TEST_F(AcceleratorControllerTest, DontRepeatToggleFullscreen) {
   const AcceleratorData accelerators[] = {
       {true, ui::VKEY_J, ui::EF_ALT_DOWN, TOGGLE_FULLSCREEN},
       {true, ui::VKEY_K, ui::EF_ALT_DOWN, TOGGLE_FULLSCREEN},
   };
   GetController()->RegisterAccelerators(accelerators, arraysize(accelerators));
 
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
   params.bounds = gfx::Rect(5, 5, 20, 20);
-  mus::SetResizeBehavior(
-      &params.mus_properties,
-      static_cast<uint32_t>(ui::mojom::kResizeBehaviorCanMaximize));
   views::Widget* widget = new views::Widget;
   mus::WmWindowMus::Get(GetPrimaryRootWindow())
       ->GetRootWindowController()
       ->ConfigureWidgetInitParamsForContainer(
           widget, kShellWindowId_DefaultContainer, &params);
   widget->Init(params);
+  widget->GetNativeView()->SetProperty(aura::client::kResizeBehaviorKey,
+                                       ui::mojom::kResizeBehaviorCanMaximize);
   widget->Show();
   widget->Activate();
 
   wm::WindowState* window_state =
       WmLookup::Get()->GetWindowForWidget(widget)->GetWindowState();
 
   // Toggling not suppressed.
   ProcessAccelerator(ui::VKEY_J, ui::EF_ALT_DOWN);
   EXPECT_TRUE(window_state->IsFullscreen());
 
@@ skipping 509 matching lines @@
 
   for (size_t i = 0; i < kActionsNeedingWindowLength; ++i) {
     delegate->TriggerAccessibilityAlert(A11Y_ALERT_NONE);
     EXPECT_TRUE(
         GetController()->PerformActionIfEnabled(kActionsNeedingWindow[i]));
     EXPECT_EQ(delegate->GetLastAccessibilityAlert(), A11Y_ALERT_WINDOW_NEEDED);
   }
 
   // Make sure we don't alert if we do have a window.
   for (size_t i = 0; i < kActionsNeedingWindowLength; ++i) {
-    ui::Window* ui_window = CreateTestWindow(gfx::Rect(5, 5, 20, 20));
-    mus::WmWindowMus::Get(ui_window)->Activate();
+    aura::Window* aura_window = CreateTestWindow(gfx::Rect(5, 5, 20, 20));
+    mus::WmWindowMus::Get(aura_window)->Activate();
     delegate->TriggerAccessibilityAlert(A11Y_ALERT_NONE);
     GetController()->PerformActionIfEnabled(kActionsNeedingWindow[i]);
     EXPECT_NE(delegate->GetLastAccessibilityAlert(), A11Y_ALERT_WINDOW_NEEDED);
-    ui_window->Destroy();
+    delete aura_window;
   }
 
   // Don't alert if we have a minimized window either.
   for (size_t i = 0; i < kActionsNeedingWindowLength; ++i) {
-    ui::Window* ui_window = CreateTestWindow(gfx::Rect(5, 5, 20, 20));
-    mus::WmWindowMus::Get(ui_window)->Activate();
+    aura::Window* aura_window = CreateTestWindow(gfx::Rect(5, 5, 20, 20));
+    mus::WmWindowMus::Get(aura_window)->Activate();
     GetController()->PerformActionIfEnabled(WINDOW_MINIMIZE);
     delegate->TriggerAccessibilityAlert(A11Y_ALERT_NONE);
     GetController()->PerformActionIfEnabled(kActionsNeedingWindow[i]);
     EXPECT_NE(delegate->GetLastAccessibilityAlert(), A11Y_ALERT_WINDOW_NEEDED);
-    ui_window->Destroy();
+    delete aura_window;
   }
 }
 
 #if defined(OS_CHROMEOS)
 namespace {
 
 // defines a class to test the behavior of deprecated accelerators.
 class DeprecatedAcceleratorTester : public AcceleratorControllerTest {
  public:
   DeprecatedAcceleratorTester() {}
@@ skipping 97 matching lines @@
     EXPECT_TRUE(IsMessageCenterEmpty());
 
     // If the action is LOCK_SCREEN, we must reset the state by unlocking the
     // screen before we proceed testing the rest of accelerators.
     ResetStateIfNeeded();
   }
 }
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace ash