[mus+ash] Removes WmWindow from ash/wm/mru_window_tracker and overview mode

chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc

 // Copyright 2013 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 <stddef.h>
 
 #include "ash/content/shell_content_state.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shelf/wm_shelf.h"
@@ skipping 30 matching lines @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/test/base/test_browser_window_aura.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "components/signin/core/account_id/account_id.h"
 #include "components/user_manager/user_info.h"
 #include "components/user_manager/user_manager.h"
 #include "ui/aura/client/aura_constants.h"
+#include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/wm/core/window_modality_controller.h"
 #include "ui/wm/core/window_util.h"
 #include "ui/wm/public/activation_client.h"
 
 namespace {
 
 const char kAAccountIdString[] =
     "{\"account_type\":\"unknown\",\"email\":\"A\"}";
@@ skipping 103 matching lines @@
     base::TimeTicks now = base::TimeTicks::Now();
     while (multi_user_window_manager_->IsAnimationRunningForTest()) {
       // This should never take longer then a second.
       ASSERT_GE(1000, (base::TimeTicks::Now() - now).InMilliseconds());
       base::RunLoop().RunUntilIdle();
     }
   }
 
   // Return the window with the given index.
   aura::Window* window(size_t index) {
-    DCHECK(index < window_.size());
-    return window_[index];
+    DCHECK(index < windows_.size());
+    return windows_[index];
   }
 
   // Delete the window at the given index, and set the referefence to NULL.
   void delete_window_at(size_t index) {
-    delete window_[index];
-    window_[index] = NULL;
+    delete windows_[index];
+    windows_[index] = NULL;
   }
 
   // The accessor to the MultiWindowManager.
   chrome::MultiUserWindowManagerChromeOS* multi_user_window_manager() {
     return multi_user_window_manager_;
   }
 
   chromeos::FakeChromeUserManager* user_manager() { return fake_user_manager_; }
 
   TestingProfileManager* profile_manager() { return profile_manager_.get(); }
@@ skipping 86 matching lines @@
   }
 
   MaximizeModeWindowManager* maximize_mode_window_manager() {
     return Shell::Get()
         ->maximize_mode_controller()
         ->maximize_mode_window_manager_.get();
   }
 
  private:
   // These get created for each session.
-  std::vector<aura::Window*> window_;
+  aura::Window::Windows windows_;
 
   // The instance of the MultiUserWindowManager.
   chrome::MultiUserWindowManagerChromeOS* multi_user_window_manager_;
 
   // Owned by |user_manager_enabler_|.
   chromeos::FakeChromeUserManager* fake_user_manager_ = nullptr;
 
   std::unique_ptr<TestingProfileManager> profile_manager_;
 
   chromeos::ScopedUserManagerEnabler user_manager_enabler_;
@@ skipping 13 matching lines @@
   AshTestBase::SetUp();
   profile_manager_.reset(
       new TestingProfileManager(TestingBrowserProcess::GetGlobal()));
   ASSERT_TRUE(profile_manager_.get()->SetUp());
   EnsureTestUser(AccountId::FromUserEmail("a"));
   EnsureTestUser(AccountId::FromUserEmail("b"));
   EnsureTestUser(AccountId::FromUserEmail("c"));
 }
 
 void MultiUserWindowManagerChromeOSTest::SetUpForThisManyWindows(int windows) {
-  DCHECK(window_.empty());
+  DCHECK(windows_.empty());
   for (int i = 0; i < windows; i++) {
-    window_.push_back(CreateTestWindowInShellWithId(i));
-    window_[i]->Show();
+    windows_.push_back(CreateTestWindowInShellWithId(i));
+    windows_[i]->Show();
   }
   multi_user_window_manager_ =
       new chrome::MultiUserWindowManagerChromeOS(AccountId::FromUserEmail("A"));
   multi_user_window_manager_->Init();
   multi_user_window_manager_->SetAnimationSpeedForTest(
       chrome::MultiUserWindowManagerChromeOS::ANIMATION_SPEED_DISABLED);
   chrome::MultiUserWindowManager::SetInstanceForTest(multi_user_window_manager_,
         chrome::MultiUserWindowManager::MULTI_PROFILE_MODE_SEPARATED);
   EXPECT_TRUE(multi_user_window_manager_);
   chromeos::WallpaperManager::Initialize();
 }
 
 void MultiUserWindowManagerChromeOSTest::TearDown() {
   // Since the AuraTestBase is needed to create our assets, we have to
   // also delete them before we tear it down.
-  while (!window_.empty()) {
-    delete *(window_.begin());
-    window_.erase(window_.begin());
+  while (!windows_.empty()) {
+    delete *(windows_.begin());
+    windows_.erase(windows_.begin());
   }
 
   chrome::MultiUserWindowManager::DeleteInstance();
   AshTestBase::TearDown();
   chromeos::WallpaperManager::Shutdown();
   profile_manager_.reset();
 }
 
 std::string MultiUserWindowManagerChromeOSTest::GetStatus() {
   std::string s;
-  for (size_t i = 0; i < window_.size(); i++) {
+  for (size_t i = 0; i < windows_.size(); i++) {
     if (i)
       s += ", ";
     if (!window(i)) {
       s += "D";
       continue;
     }
     s += window(i)->IsVisible() ? "S[" : "H[";
     const AccountId& owner =
         multi_user_window_manager_->GetWindowOwner(window(i));
     s += owner.GetUserEmail();
@@ skipping 1148 matching lines @@
   multi_user_window_manager()->SetWindowOwner(window(1), account_id_A);
   multi_user_window_manager()->SetWindowOwner(window(2), account_id_A);
   EXPECT_EQ("S[A], S[A], S[A]", GetStatus());
 
   // Activate the windows one by one.
   activation_client->ActivateWindow(window(2));
   activation_client->ActivateWindow(window(1));
   activation_client->ActivateWindow(window(0));
   EXPECT_EQ(wm::GetActiveWindow(), window(0));
 
-  aura::Window::Windows mru_list = WmWindow::ToAuraWindows(
-      Shell::Get()->mru_window_tracker()->BuildMruWindowList());
+  aura::Window::Windows mru_list =
+      Shell::Get()->mru_window_tracker()->BuildMruWindowList();
   EXPECT_EQ(mru_list[0], window(0));
   EXPECT_EQ(mru_list[1], window(1));
   EXPECT_EQ(mru_list[2], window(2));
 
   user_manager()->SwitchActiveUser(account_id_B);
   multi_user_window_manager()->ActiveUserChanged(
       user_manager()->FindUser(account_id_B));
   EXPECT_EQ("H[A], H[A], H[A]", GetStatus());
   EXPECT_EQ(wm::GetActiveWindow(), nullptr);
 
   user_manager()->SwitchActiveUser(account_id_A);
   multi_user_window_manager()->ActiveUserChanged(
       user_manager()->FindUser(account_id_A));
   EXPECT_EQ("S[A], S[A], S[A]", GetStatus());
   EXPECT_EQ(wm::GetActiveWindow(), window(0));
 
-  mru_list = WmWindow::ToAuraWindows(
-      Shell::Get()->mru_window_tracker()->BuildMruWindowList());
+  mru_list = Shell::Get()->mru_window_tracker()->BuildMruWindowList();
   EXPECT_EQ(mru_list[0], window(0));
   EXPECT_EQ(mru_list[1], window(1));
   EXPECT_EQ(mru_list[2], window(2));
 }
 
 // Tests that ChromeNewWindowClient::GetActiveBrowser works properly in
 // multi-user scenario, that is it should return the browser with active window
 // associated with it (crbug.com/675265).
 TEST_F(MultiUserWindowManagerChromeOSTest, GetActiveBrowserTest) {
   SetUpForThisManyWindows(1);
@@ skipping 25 matching lines @@
   user_manager()->SwitchActiveUser(account_id_B);
   multi_user_window_manager()->ActiveUserChanged(
       user_manager()->FindUser(account_id_B));
   EXPECT_EQ(browser.get(), BrowserList::GetInstance()->GetLastActive());
   EXPECT_EQ(nullptr, wm::GetActiveWindow());
   EXPECT_EQ(nullptr, ChromeNewWindowClient::GetActiveBrowser());
 }
 
 }  // namespace test
 }  // namespace ash