Moves maintaining root_window_for_new_windows_ to Shell

chrome/browser/ui/window_sizer/window_sizer_ash_uitest.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 "ash/common/shelf/shelf_view.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/wm_window.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/location.h"
@@ skipping 84 matching lines @@
                                   KeepAliveRestartOption::DISABLED);
 
   aura::Window::Windows root_windows = ash::Shell::GetAllRootWindows();
 
   BrowserList* browser_list = BrowserList::GetInstance();
 
   EXPECT_EQ(1u, browser_list->size());
   // Close the browser window so that clicking icon will create a new window.
   CloseBrowser(browser_list->get(0));
   EXPECT_EQ(0u, browser_list->size());
-  EXPECT_EQ(root_windows[0], ash::Shell::GetTargetRootWindow());
+  EXPECT_EQ(root_windows[0], ash::Shell::GetRootWindowForNewWindows());
 
   OpenBrowserUsingShelfOnRootWindow(root_windows[1]);
 
   // A new browser must be created on 2nd display.
   EXPECT_EQ(1u, browser_list->size());
   EXPECT_EQ(root_windows[1],
             browser_list->get(0)->window()->GetNativeWindow()->GetRootWindow());
-  EXPECT_EQ(root_windows[1], ash::Shell::GetTargetRootWindow());
+  EXPECT_EQ(root_windows[1], ash::Shell::GetRootWindowForNewWindows());
 
   // Close the browser window so that clicking icon will create a new window.
   CloseBrowser(browser_list->get(0));
   EXPECT_EQ(0u, browser_list->size());
 
   OpenBrowserUsingShelfOnRootWindow(root_windows[0]);
 
   // A new browser must be created on 1st display.
   EXPECT_EQ(1u, browser_list->size());
   EXPECT_EQ(root_windows[0],
             browser_list->get(0)->window()->GetNativeWindow()->GetRootWindow());
-  EXPECT_EQ(root_windows[0], ash::Shell::GetTargetRootWindow());
+  EXPECT_EQ(root_windows[0], ash::Shell::GetRootWindowForNewWindows());
 }
 
 namespace {
 
 class WindowSizerContextMenuTest : public WindowSizerTest {
  public:
   WindowSizerContextMenuTest() {}
   ~WindowSizerContextMenuTest() override {}
 
   static void Step1(gfx::Point release_point) {
@@ skipping 42 matching lines @@
   ScopedKeepAlive test_keep_alive(KeepAliveOrigin::BROWSER_PROCESS_CHROMEOS,
                                   KeepAliveRestartOption::DISABLED);
 
   views::MenuController::TurnOffMenuSelectionHoldForTest();
 
   aura::Window::Windows root_windows = ash::Shell::GetAllRootWindows();
 
   BrowserList* browser_list = BrowserList::GetInstance();
 
   ASSERT_EQ(1u, browser_list->size());
-  EXPECT_EQ(root_windows[0], ash::Shell::GetTargetRootWindow());
+  EXPECT_EQ(root_windows[0], ash::Shell::GetRootWindowForNewWindows());
   CloseBrowser(browser_list->get(0));
 
   OpenBrowserUsingContextMenuOnRootWindow(root_windows[1]);
 
   // A new browser must be created on 2nd display.
   ASSERT_EQ(1u, browser_list->size());
   EXPECT_EQ(root_windows[1],
             browser_list->get(0)->window()->GetNativeWindow()->GetRootWindow());
-  EXPECT_EQ(root_windows[1], ash::Shell::GetTargetRootWindow());
+  EXPECT_EQ(root_windows[1], ash::Shell::GetRootWindowForNewWindows());
 
   CloseBrowser(browser_list->get(0));
   OpenBrowserUsingContextMenuOnRootWindow(root_windows[0]);
 
   // Next new browser must be created on 1st display.
   ASSERT_EQ(1u, browser_list->size());
   EXPECT_EQ(root_windows[0],
             browser_list->get(0)->window()->GetNativeWindow()->GetRootWindow());
-  EXPECT_EQ(root_windows[0], ash::Shell::GetTargetRootWindow());
+  EXPECT_EQ(root_windows[0], ash::Shell::GetRootWindowForNewWindows());
 }