Moves maintaining root_window_for_new_windows_ to Shell

chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc

 // Copyright (c) 2012 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/scoped_root_window_for_new_windows.h"
 #include "ash/common/wm/window_positioner.h"
 #include "ash/common/wm/window_resizer.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
@@ skipping 555 matching lines @@
 
   std::unique_ptr<TestingProfile> profile(new TestingProfile());
 
   // Create browser windows that are used as reference.
   Browser::CreateParams params(profile.get(), true);
   std::unique_ptr<Browser> browser(CreateTestBrowser(
       CreateTestWindowInShellWithId(0), gfx::Rect(10, 10, 200, 200), &params));
   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(
       CreateTestBrowser(CreateTestWindowInShellWithId(1),
                         gfx::Rect(400, 10, 300, 300), &another_params));
   BrowserWindow* another_browser_window = another_browser->window();
   gfx::NativeWindow another_native_window =
       another_browser_window->GetNativeWindow();
   another_browser_window->Show();
 
   // Creating a new window to verify the new placement.
   Browser::CreateParams new_params(profile.get(), true);
   std::unique_ptr<Browser> new_browser(CreateTestBrowser(
       CreateTestWindowInShellWithId(0), gfx::Rect(), &new_params));
 
   // 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.
   {
     gfx::Rect window_bounds;
     GetWindowBounds(p1600x1200, p1600x1200, secondary_bounds, gfx::Rect(),
                     secondary_bounds, PERSISTED, new_browser.get(), gfx::Rect(),
                     &window_bounds);
     // TODO(oshima): Use exact bounds when the window_sizer_ash is
     // moved to ash and changed to include the result from
     // RearrangeVisibleWindowOnShow.
     EXPECT_TRUE(primary_bounds.Contains(window_bounds));
   }
 
   // Move the window to the right side of the secondary display and create a new
   // window. It should be opened then on the secondary display.
   {
     display::Display second_display =
         display::Screen::GetScreen()->GetDisplayNearestPoint(
             gfx::Point(1600 + 100, 10));
     browser_window->GetNativeWindow()->SetBoundsInScreen(
         gfx::Rect(secondary_bounds.CenterPoint().x() - 100, 10, 200, 200),
         second_display);
     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(
         p1600x1200, p1600x1200, secondary_bounds, gfx::Rect(), secondary_bounds,
         ui::SHOW_STATE_DEFAULT, ui::SHOW_STATE_DEFAULT, PERSISTED,
         new_browser.get(), gfx::Rect(), 1u, &window_bounds, &out_show_state);
     // TODO(oshima): Use exact bounds when the window_sizer_ash is
     // moved to ash and changed to include the result from
     // RearrangeVisibleWindowOnShow.
     EXPECT_TRUE(secondary_bounds.Contains(window_bounds));
   }
 
   // Activate another window in the primary display and create a new window.
   // It should be created in the primary display.
   {
     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(),
                     secondary_bounds, PERSISTED, new_browser.get(), gfx::Rect(),
                     &window_bounds);
     // TODO(oshima): Use exact bounds when the window_sizer_ash is
     // moved to ash and changed to include the result from
     // RearrangeVisibleWindowOnShow.
     EXPECT_TRUE(primary_bounds.Contains(window_bounds));
   }
@@ skipping 167 matching lines @@
 // the non browser window. This differ from PersistedBoundsCase
 // in that this uses real ash shell implementations + StateProvider
 // TargetDisplayProvider, rather than mocks.
 TEST_F(WindowSizerAshTest, DefaultBoundsInTargetDisplay) {
   if (!ash_util::ShouldOpenAshOnStartup())
     return;
   UpdateDisplay("500x500,600x600");
 
   // 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(),
                                                   NULL, &bounds, &show_state);
   EXPECT_TRUE(first_root->GetBoundsInScreen().Contains(bounds));
 
   {
     // When the second display is active new windows are placed there.
     ash::WmWindow* second_root = ash::WmShell::Get()->GetAllRootWindows()[1];
     ash::ScopedRootWindowForNewWindows tmp(second_root);
@@ skipping 23 matching lines @@
   EXPECT_EQ(
       ui::SHOW_STATE_DEFAULT,
       GetWindowShowState(ui::SHOW_STATE_DEFAULT, ui::SHOW_STATE_NORMAL, BOTH,
                          trusted_popup.get(), p1280x1024, p1600x1200));
   // A popup that is sized to occupy the whole work area has default state.
   EXPECT_EQ(
       ui::SHOW_STATE_DEFAULT,
       GetWindowShowState(ui::SHOW_STATE_DEFAULT, ui::SHOW_STATE_NORMAL, BOTH,
                          trusted_popup.get(), p1600x1200, p1600x1200));
 }