Remove WmLookup.

ash/root_window_controller_unittest.cc

Index: ash/root_window_controller_unittest.cc
diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc
index f4af922465e7e7fd3cf7a0a23613c1535823a51a..cf5c9b90ba10b350705a2b986be9b06db502e323 100644
--- a/ash/root_window_controller_unittest.cc
+++ b/ash/root_window_controller_unittest.cc
@@ -11,7 +11,6 @@
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/wm/system_modal_container_layout_manager.h"
 #include "ash/common/wm/window_state.h"
-#include "ash/common/wm_lookup.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/public/cpp/shell_window_ids.h"
@@ -396,7 +395,7 @@ TEST_F(RootWindowControllerTest, ModalContainer) {
       CreateModalWidget(gfx::Rect(300, 10, 100, 100));
   EXPECT_EQ(GetLayoutManager(controller, kShellWindowId_SystemModalContainer),
             controller->GetSystemModalLayoutManager(
-                WmLookup::Get()->GetWindowForWidget(session_modal_widget)));
+                WmWindow::Get(session_modal_widget->GetNativeWindow())));
 
   wm_shell->GetSessionStateDelegate()->LockScreen();
   EXPECT_EQ(LoginStatus::LOCKED,
@@ -412,10 +411,10 @@ TEST_F(RootWindowControllerTest, ModalContainer) {
   EXPECT_EQ(
       GetLayoutManager(controller, kShellWindowId_LockSystemModalContainer),
       controller->GetSystemModalLayoutManager(
-          WmLookup::Get()->GetWindowForWidget(lock_modal_widget)));
+          WmWindow::Get(lock_modal_widget->GetNativeWindow())));
   EXPECT_EQ(GetLayoutManager(controller, kShellWindowId_SystemModalContainer),
             controller->GetSystemModalLayoutManager(
-                WmLookup::Get()->GetWindowForWidget(session_modal_widget)));
+                WmWindow::Get(session_modal_widget->GetNativeWindow())));
 
   wm_shell->GetSessionStateDelegate()->UnlockScreen();
 }
@@ -445,7 +444,7 @@ TEST_F(RootWindowControllerTest, ModalContainerNotLoggedInLoggedIn) {
   EXPECT_EQ(
       GetLayoutManager(controller, kShellWindowId_LockSystemModalContainer),
       controller->GetSystemModalLayoutManager(
-          WmLookup::Get()->GetWindowForWidget(login_modal_widget)));
+          WmWindow::Get(login_modal_widget->GetNativeWindow())));
   login_modal_widget->Close();
 
   // Configure user session environment.
@@ -462,7 +461,7 @@ TEST_F(RootWindowControllerTest, ModalContainerNotLoggedInLoggedIn) {
       CreateModalWidget(gfx::Rect(300, 10, 100, 100));
   EXPECT_EQ(GetLayoutManager(controller, kShellWindowId_SystemModalContainer),
             controller->GetSystemModalLayoutManager(
-                WmLookup::Get()->GetWindowForWidget(session_modal_widget)));
+                WmWindow::Get(session_modal_widget->GetNativeWindow())));
 }
 
 TEST_F(RootWindowControllerTest, ModalContainerBlockedSession) {
@@ -477,7 +476,7 @@ TEST_F(RootWindowControllerTest, ModalContainerBlockedSession) {
         CreateModalWidget(gfx::Rect(300, 10, 100, 100));
     EXPECT_EQ(GetLayoutManager(controller, kShellWindowId_SystemModalContainer),
               controller->GetSystemModalLayoutManager(
-                  WmLookup::Get()->GetWindowForWidget(session_modal_widget)));
+                  WmWindow::Get(session_modal_widget->GetNativeWindow())));
     EXPECT_EQ(GetLayoutManager(controller, kShellWindowId_SystemModalContainer),
               controller->GetSystemModalLayoutManager(NULL));
     session_modal_widget->Close();
@@ -493,12 +492,12 @@ TEST_F(RootWindowControllerTest, ModalContainerBlockedSession) {
     EXPECT_EQ(
         GetLayoutManager(controller, kShellWindowId_LockSystemModalContainer),
         controller->GetSystemModalLayoutManager(
-            WmLookup::Get()->GetWindowForWidget(lock_modal_widget)));
+            WmWindow::Get(lock_modal_widget->GetNativeWindow())));
 
     session_modal_widget = CreateModalWidget(gfx::Rect(300, 10, 100, 100));
     EXPECT_EQ(GetLayoutManager(controller, kShellWindowId_SystemModalContainer),
               controller->GetSystemModalLayoutManager(
-                  WmLookup::Get()->GetWindowForWidget(session_modal_widget)));
+                  WmWindow::Get(session_modal_widget->GetNativeWindow())));
     session_modal_widget->Close();
 
     lock_modal_widget->Close();