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 806 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::GetInstance()->GetRootWindowForNewWindows());
   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));
 }