Replace kCanMaximize/Minimize/Resize with kResizeBehavior.

ash/wm/ash_focus_rules_unittest.cc

 // Copyright 2015 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/session/session_state_delegate.h"
 #include "ash/common/test/test_session_state_delegate.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_shell.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/ash_test_helper.h"
 #include "ash/test/test_shell_delegate.h"
 #include "ash/wm/lock_state_controller.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
+#include "services/ui/public/interfaces/window_manager_constants.mojom.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/window_parenting_client.h"
 #include "ui/views/test/widget_test.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace test {
 
 namespace {
@@ skipping 98 matching lines @@
     aura::Window* container = Shell::GetContainer(root_window, container_id);
     aura::Window* window = new aura::Window(nullptr);
     window->set_id(0);
     window->SetType(ui::wm::WINDOW_TYPE_NORMAL);
     window->Init(ui::LAYER_TEXTURED);
     window->Show();
 
     aura::client::ParentWindowWithContext(window, container,
                                           gfx::Rect(0, 0, 400, 400));
 
-    window->SetProperty(aura::client::kCanMaximizeKey, true);
-    window->SetProperty(aura::client::kCanMinimizeKey, true);
+    window->SetProperty(aura::client::kResizeBehaviorKey,
+                        ui::mojom::kResizeBehaviorCanMaximize |
+                            ui::mojom::kResizeBehaviorCanMinimize |
+                            ui::mojom::kResizeBehaviorCanResize);
     return window;
   }
 
   DISALLOW_COPY_AND_ASSIGN(LockScreenAshFocusRulesTest);
 };
 
 }  // namespace
 
 // Verifies focus is returned (after unlocking the screen) to the most recent
 // window that had it before locking the screen.
@@ skipping 53 matching lines @@
   EXPECT_FALSE(delegate.view()->HasFocus());
 
   UnblockUserSession();
   EXPECT_FALSE(WmShell::Get()->GetSessionStateDelegate()->IsScreenLocked());
   EXPECT_TRUE(delegate.GetWidget()->IsActive());
   EXPECT_TRUE(delegate.view()->HasFocus());
 }
 
 }  // namespace test
 }  // namespace ash