Move even more from WmShell to Shell

chrome/browser/ui/ash/chrome_new_window_client_browsertest.cc

Index: chrome/browser/ui/ash/chrome_new_window_client_browsertest.cc
diff --git a/chrome/browser/ui/ash/chrome_new_window_client_browsertest.cc b/chrome/browser/ui/ash/chrome_new_window_client_browsertest.cc
index bc259a400d88de7dd8c348a9185eeeef4bcde3df..c3247773c7ffa4cc0c13f396133fefe60e5cdea7 100644
--- a/chrome/browser/ui/ash/chrome_new_window_client_browsertest.cc
+++ b/chrome/browser/ui/ash/chrome_new_window_client_browsertest.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "ash/common/new_window_controller.h"
-#include "ash/common/wm_shell.h"
+#include "ash/shell.h"
 #include "ash/wm/window_util.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser_finder.h"
@@ -33,7 +33,7 @@ IN_PROC_BROWSER_TEST_F(ChromeNewWindowClientBrowserTest,
   Profile* profile1 = ProfileManager::GetActiveUserProfile();
   Browser* browser1 = CreateBrowser(profile1);
   // The newly created window should be created for the current active profile.
-  ash::WmShell::Get()->new_window_controller()->NewWindow(false);
+  ash::Shell::Get()->new_window_controller()->NewWindow(false);
   EXPECT_EQ(
       chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow())->profile(),
       profile1);
@@ -47,7 +47,7 @@ IN_PROC_BROWSER_TEST_F(ChromeNewWindowClientBrowserTest,
   Browser* browser2 = CreateBrowser(profile2);
   // The newly created window should be created for the current active window's
   // profile, which is |profile2|.
-  ash::WmShell::Get()->new_window_controller()->NewWindow(false);
+  ash::Shell::Get()->new_window_controller()->NewWindow(false);
   EXPECT_EQ(
       chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow())->profile(),
       profile2);
@@ -55,7 +55,7 @@ IN_PROC_BROWSER_TEST_F(ChromeNewWindowClientBrowserTest,
   // After activating |browser1|, the newly created window should be created
   // against |browser1|'s profile.
   browser1->window()->Show();
-  ash::WmShell::Get()->new_window_controller()->NewWindow(false);
+  ash::Shell::Get()->new_window_controller()->NewWindow(false);
   EXPECT_EQ(
       chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow())->profile(),
       profile1);
@@ -64,7 +64,7 @@ IN_PROC_BROWSER_TEST_F(ChromeNewWindowClientBrowserTest,
   // The newly created incoginito window should be created against the current
   // active |browser1|'s profile.
   browser1->window()->Show();
-  ash::WmShell::Get()->new_window_controller()->NewWindow(true);
+  ash::Shell::Get()->new_window_controller()->NewWindow(true);
   EXPECT_EQ(chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow())
                 ->profile()
                 ->GetOriginalProfile(),
@@ -73,7 +73,7 @@ IN_PROC_BROWSER_TEST_F(ChromeNewWindowClientBrowserTest,
   // The newly created incoginito window should be created against the current
   // active |browser2|'s profile.
   browser2->window()->Show();
-  ash::WmShell::Get()->new_window_controller()->NewWindow(true);
+  ash::Shell::Get()->new_window_controller()->NewWindow(true);
   EXPECT_EQ(chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow())
                 ->profile()
                 ->GetOriginalProfile(),