Don't track windows that were interacted (restored/minimized) by user while wallpaper picker applic…

chrome/browser/chromeos/extensions/wallpaper_private_api_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/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_session_state_delegate.h"
 #include "ash/test/test_shell_delegate.h"
 #include "ash/wm/window_state.h"
 #include "base/command_line.h"
@@ skipping 52 matching lines @@
     return WallpaperPrivateRestoreMinimizedWindowsFunction::RunAsync();
   }
  protected:
   ~TestRestoreFunction() override {}
 };
 
 }  // namespace
 
 TEST_F(WallpaperPrivateApiUnittest, HideAndRestoreWindows) {
   fake_user_manager()->AddUser(kTestAccount1);
+  scoped_ptr<aura::Window> window4(CreateTestWindowInShellWithId(4));
   scoped_ptr<aura::Window> window3(CreateTestWindowInShellWithId(3));
   scoped_ptr<aura::Window> window2(CreateTestWindowInShellWithId(2));
   scoped_ptr<aura::Window> window1(CreateTestWindowInShellWithId(1));
   scoped_ptr<aura::Window> window0(CreateTestWindowInShellWithId(0));
 
   ash::wm::WindowState* window0_state = ash::wm::GetWindowState(window0.get());
   ash::wm::WindowState* window1_state = ash::wm::GetWindowState(window1.get());
   ash::wm::WindowState* window2_state = ash::wm::GetWindowState(window2.get());
   ash::wm::WindowState* window3_state = ash::wm::GetWindowState(window3.get());
+  ash::wm::WindowState* window4_state = ash::wm::GetWindowState(window4.get());
 
   window3_state->Minimize();
   window1_state->Maximize();
 
   // Window 3 starts minimized, window 1 starts maximized.
   EXPECT_FALSE(window0_state->IsMinimized());
   EXPECT_FALSE(window1_state->IsMinimized());
   EXPECT_FALSE(window2_state->IsMinimized());
   EXPECT_TRUE(window3_state->IsMinimized());
+  EXPECT_FALSE(window4_state->IsMinimized());
 
   // We then activate window 0 (i.e. wallpaper picker) and call the minimize
   // function.
   window0_state->Activate();
   EXPECT_TRUE(window0_state->IsActive());
   scoped_refptr<TestMinimizeFunction> minimize_function(
       new TestMinimizeFunction());
   EXPECT_TRUE(minimize_function->RunAsync());
 
   // All windows except window 0 should be minimized.
   EXPECT_FALSE(window0_state->IsMinimized());
   EXPECT_TRUE(window1_state->IsMinimized());
   EXPECT_TRUE(window2_state->IsMinimized());
   EXPECT_TRUE(window3_state->IsMinimized());
+  EXPECT_TRUE(window4_state->IsMinimized());
+
+  // Activates window 4 and then minimizes it.
+  window4_state->Activate();
+  window4_state->Minimize();
 
   // Then we destroy window 0 and call the restore function.
   window0.reset();
   scoped_refptr<TestRestoreFunction> restore_function(
       new TestRestoreFunction());
   EXPECT_TRUE(restore_function->RunAsync());
 
   // Windows 1 and 2 should no longer be minimized. Window 1 should again
-  // be maximized. Window 3 should still be minimized.
+  // be maximized. Window 3 should still be minimized. Window 4 should remain
+  // minimized since user interacted with it while wallpaper picker was open.
   EXPECT_TRUE(window1_state->IsMaximized());
   EXPECT_FALSE(window2_state->IsMinimized());
   EXPECT_TRUE(window3_state->IsMinimized());
+  EXPECT_TRUE(window4_state->IsMinimized());
 }
 
 // Test for multiple calls to |MinimizeInactiveWindows| before call
 // |RestoreWindows|:
 // 1. If all window hasn't change their states, the following calls are noops.
 // 2. If some windows are manually unminimized, the following call will minimize
 // all the unminimized windows.
 TEST_F(WallpaperPrivateApiUnittest, HideAndManualUnminimizeWindows) {
   fake_user_manager()->AddUser(kTestAccount1);
   scoped_ptr<aura::Window> window1(CreateTestWindowInShellWithId(1));
@@ skipping 266 matching lines @@
   scoped_refptr<TestRestoreFunction> restore_function_1(
       new TestRestoreFunction());
   EXPECT_TRUE(restore_function_1->RunAsync());
 
   EXPECT_FALSE(window1_state->IsMinimized());
   EXPECT_FALSE(window2_state->IsMinimized());
   EXPECT_FALSE(window3_state->IsMinimized());
 }
 
 }  // namespace chromeos