MonitorManager to manage multiple monitors.

ash/wm/toplevel_layout_manager_unittest.cc

Index: ash/wm/toplevel_layout_manager_unittest.cc
diff --git a/ash/wm/toplevel_layout_manager_unittest.cc b/ash/wm/toplevel_layout_manager_unittest.cc
index dff916a1949132d1c5955b3cf8af08bba6d87649..fb138eb612dd040ca886a1b531a4535b74ffed77 100644
--- a/ash/wm/toplevel_layout_manager_unittest.cc
+++ b/ash/wm/toplevel_layout_manager_unittest.cc
@@ -33,7 +33,8 @@ class ToplevelLayoutManagerTest : public test::AshTestBase {
 
   virtual void SetUp() OVERRIDE {
     test::AshTestBase::SetUp();
-    Shell::GetInstance()->SetScreenWorkAreaInsets(
+    Shell::GetInstance()->SetMonitorWorkAreaInsets(
+        Shell::GetRootWindow(),
         gfx::Insets(1, 2, 3, 4));
     Shell::GetRootWindow()->SetHostSize(gfx::Size(800, 600));
     aura::Window* default_container = Shell::GetInstance()->GetContainer(
@@ -105,14 +106,18 @@ TEST_F(ToplevelLayoutManagerTest,
        ResizeMaximizedWindowOnWorkAreaInsetsChange) {
   gfx::Rect bounds(100, 100, 200, 200);
   scoped_ptr<aura::Window> window(CreateTestWindow(bounds));
-  Shell::GetInstance()->SetScreenWorkAreaInsets(gfx::Insets(0, 0, 30, 0));
+  Shell::GetInstance()->SetMonitorWorkAreaInsets(
+      Shell::GetRootWindow(),
+      gfx::Insets(0, 0, 30, 0));
   window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MAXIMIZED);
   // Maximized window fills the work area.
   EXPECT_EQ(gfx::Screen::GetMonitorWorkAreaNearestWindow(window.get()),
             window->bounds());
 
   // Change work area insets.
-  Shell::GetInstance()->SetScreenWorkAreaInsets(gfx::Insets(0, 0, 60, 0));
+  Shell::GetInstance()->SetMonitorWorkAreaInsets(
+      Shell::GetRootWindow(),
+      gfx::Insets(0, 0, 60, 0));
   // Maximized window fills the changed work area.
   EXPECT_EQ(gfx::Screen::GetMonitorWorkAreaNearestWindow(window.get()),
             window->bounds());