Add WM_EVENT_TRUSTED_PIN and WINDOW_STATE_TYPE_TRUSTED_PINNED to Ash.

ash/wm/screen_pinning_controller_unittest.cc

 // Copyright 2016 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/wm/screen_pinning_controller.h"
 
 #include <vector>
 
 #include "ash/aura/wm_window_aura.h"
+#include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm/wm_event.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/window_util.h"
 #include "base/stl_util.h"
 #include "ui/aura/window.h"
 
 namespace ash {
 namespace {
 
 int FindIndex(const std::vector<aura::Window*>& windows,
               const aura::Window* target) {
   auto iter = std::find(windows.begin(), windows.end(), target);
   return iter != windows.end() ? iter - windows.begin() : -1;
 }
 
 }  // namespace
 
 using ScreenPinningControllerTest = test::AshTestBase;
 
 TEST_F(ScreenPinningControllerTest, IsPinned) {
   aura::Window* w1 = CreateTestWindowInShellWithId(0);
   wm::ActivateWindow(w1);
 
-  wm::PinWindow(w1);
+  wm::PinWindow(w1, /* trusted */ false);
   EXPECT_TRUE(WmShell::Get()->IsPinned());
 }
 
 TEST_F(ScreenPinningControllerTest, OnlyOnePinnedWindow) {
   aura::Window* w1 = CreateTestWindowInShellWithId(0);
   aura::Window* w2 = CreateTestWindowInShellWithId(1);
   wm::ActivateWindow(w1);
 
-  wm::PinWindow(w1);
+  wm::PinWindow(w1, /* trusted */ false);
   EXPECT_TRUE(WmWindowAura::Get(w1)->GetWindowState()->IsPinned());
   EXPECT_FALSE(WmWindowAura::Get(w2)->GetWindowState()->IsPinned());
 
   // Prohibit to pin two (or more) windows.
-  wm::PinWindow(w2);
+  wm::PinWindow(w2, /* trusted */ false);
   EXPECT_TRUE(WmWindowAura::Get(w1)->GetWindowState()->IsPinned());
   EXPECT_FALSE(WmWindowAura::Get(w2)->GetWindowState()->IsPinned());
 }
 
 TEST_F(ScreenPinningControllerTest, FullscreenInPinnedMode) {
   aura::Window* w1 = CreateTestWindowInShellWithId(0);
   aura::Window* w2 = CreateTestWindowInShellWithId(1);
   wm::ActivateWindow(w1);
 
-  wm::PinWindow(w1);
+  wm::PinWindow(w1, /* trusted */ false);
   {
     // Window w1 should be in front of w2.
     std::vector<aura::Window*> siblings = w1->parent()->children();
     int index1 = FindIndex(siblings, w1);
     int index2 = FindIndex(siblings, w2);
     EXPECT_NE(-1, index1);
     EXPECT_NE(-1, index2);
     EXPECT_GT(index1, index2);
   }
 
@@ skipping 74 matching lines @@
     // Verify that w1 is still in front of w2.
     std::vector<aura::Window*> siblings = w1->parent()->children();
     int index1 = FindIndex(siblings, w1);
     int index2 = FindIndex(siblings, w2);
     EXPECT_NE(-1, index1);
     EXPECT_NE(-1, index2);
     EXPECT_GT(index2, index1);
   }
 }
 
+TEST_F(ScreenPinningControllerTest, TrustedPinnedWithAccelerator) {
+  aura::Window* w1 = CreateTestWindowInShellWithId(0);
+  wm::ActivateWindow(w1);
+
+  wm::PinWindow(w1, /* trusted */ true);
+  EXPECT_TRUE(WmShell::Get()->IsPinned());
+
+  WmShell::Get()->accelerator_controller()->PerformActionIfEnabled(UNPIN);
+  EXPECT_TRUE(WmShell::Get()->IsPinned());

[hidehiko, 2016/08/29 14:31:39]

Could you explicitly comment that the "no-unpin" is expected behavior, here?

[hirono, 2016/08/30 07:16:08]

Done.

+}
+
 }  // namespace ash