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 750ba02d522a7f19ab30bc148bfa6f9707b5665f..6ac997643b903f8680a9694dc848f2fd4d1cdf31 100644 |
--- a/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc |
+++ b/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc |
@@ -4,7 +4,6 @@ |
#include "ash/scoped_root_window_for_new_windows.h" |
#include "ash/shell.h" |
-#include "ash/shell_port.h" |
#include "ash/test/ash_test_base.h" |
#include "ash/wm/window_positioner.h" |
#include "ash/wm/window_resizer.h" |
@@ -824,8 +823,8 @@ TEST_F(WindowSizerAshTest, DefaultBoundsInTargetDisplay) { |
UpdateDisplay("500x500,600x600"); |
// By default windows are placed on the primary display. |
- ash::WmWindow* first_root = ash::ShellPort::Get()->GetAllRootWindows()[0]; |
- EXPECT_EQ(first_root, ash::Shell::GetWmRootWindowForNewWindows()); |
+ aura::Window* first_root = ash::Shell::GetAllRootWindows()[0]; |
+ EXPECT_EQ(first_root, ash::Shell::GetRootWindowForNewWindows()); |
gfx::Rect bounds; |
ui::WindowShowState show_state; |
WindowSizer::GetBrowserWindowBoundsAndShowState(std::string(), gfx::Rect(), |
@@ -834,7 +833,7 @@ TEST_F(WindowSizerAshTest, DefaultBoundsInTargetDisplay) { |
{ |
// When the second display is active new windows are placed there. |
- ash::WmWindow* second_root = ash::ShellPort::Get()->GetAllRootWindows()[1]; |
+ aura::Window* second_root = ash::Shell::GetAllRootWindows()[1]; |
ash::ScopedRootWindowForNewWindows tmp(second_root); |
gfx::Rect bounds; |
ui::WindowShowState show_state; |