Moves maintaining root_window_for_new_windows_ to Shell

chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc

Index: chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc
diff --git a/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc b/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc
index aee502ab1f82e7628a1f915a31047f351dbfeb3c..796ae43732ba95073855685cc1fc1f22a9d12d00 100644
--- a/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc
+++ b/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc
@@ -573,7 +573,8 @@ TEST_F(WindowSizerAshTest, MAYBE_PlaceNewWindowsOnMultipleDisplays) {
   BrowserWindow* browser_window = browser->window();
   gfx::NativeWindow native_window = browser_window->GetNativeWindow();
   browser_window->Show();
-  EXPECT_EQ(native_window->GetRootWindow(), ash::Shell::GetTargetRootWindow());
+  EXPECT_EQ(native_window->GetRootWindow(),
+            ash::Shell::GetRootWindowForNewWindows());
 
   Browser::CreateParams another_params(profile.get(), true);
   std::unique_ptr<Browser> another_browser(
@@ -591,7 +592,7 @@ TEST_F(WindowSizerAshTest, MAYBE_PlaceNewWindowsOnMultipleDisplays) {
 
   // Make sure the primary root is active.
   ASSERT_EQ(ash::Shell::GetPrimaryRootWindow(),
-            ash::Shell::GetTargetRootWindow());
+            ash::Shell::GetRootWindowForNewWindows());
 
   // First new window should be in the primary.
   {
@@ -617,7 +618,7 @@ TEST_F(WindowSizerAshTest, MAYBE_PlaceNewWindowsOnMultipleDisplays) {
     aura::client::GetActivationClient(native_window->GetRootWindow())
         ->ActivateWindow(native_window);
     EXPECT_NE(ash::Shell::GetPrimaryRootWindow(),
-              ash::Shell::GetTargetRootWindow());
+              ash::Shell::GetRootWindowForNewWindows());
     gfx::Rect window_bounds;
     ui::WindowShowState out_show_state = ui::SHOW_STATE_DEFAULT;
     GetWindowBoundsAndShowState(
@@ -636,7 +637,7 @@ TEST_F(WindowSizerAshTest, MAYBE_PlaceNewWindowsOnMultipleDisplays) {
     aura::client::GetActivationClient(another_native_window->GetRootWindow())
         ->ActivateWindow(another_native_window);
     EXPECT_EQ(ash::Shell::GetPrimaryRootWindow(),
-              ash::Shell::GetTargetRootWindow());
+              ash::Shell::GetRootWindowForNewWindows());
 
     gfx::Rect window_bounds;
     GetWindowBounds(p1600x1200, p1600x1200, secondary_bounds, gfx::Rect(),
@@ -824,7 +825,7 @@ TEST_F(WindowSizerAshTest, DefaultBoundsInTargetDisplay) {
 
   // By default windows are placed on the primary display.
   ash::WmWindow* first_root = ash::WmShell::Get()->GetAllRootWindows()[0];
-  EXPECT_EQ(first_root, ash::WmShell::Get()->GetRootWindowForNewWindows());
+  EXPECT_EQ(first_root, ash::Shell::GetWmRootWindowForNewWindows());
   gfx::Rect bounds;
   ui::WindowShowState show_state;
   WindowSizer::GetBrowserWindowBoundsAndShowState(std::string(), gfx::Rect(),