Change GetContainer to take a root window

Update the use of GetContainer to use the correct root window.

BUG=123160
TEST=no functional change. all tests must pass.

Review URL: https://chromiumcodereview.appspot.com/10540076

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141384 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 4 deletions

diff --git a/ash/wm/system_modal_container_layout_manager_unittest.cc b/ash/wm/system_modal_container_layout_manager_unittest.cc
index 616cd1c..3eaa467 100644
--- a/ash/wm/system_modal_container_layout_manager_unittest.cc
+++ b/ash/wm/system_modal_container_layout_manager_unittest.cc
@@ -25,12 +25,14 @@ namespace test {
 namespace {
 
 aura::Window* GetModalContainer() {
-  return Shell::GetInstance()->GetContainer(
+  return Shell::GetContainer(
+      Shell::GetPrimaryRootWindow(),
       ash::internal::kShellWindowId_SystemModalContainer);
 }
 
 aura::Window* GetDefaultContainer() {
-  return Shell::GetInstance()->GetContainer(
+  return Shell::GetContainer(
+      Shell::GetPrimaryRootWindow(),
       ash::internal::kShellWindowId_DefaultContainer);
 }
 
@@ -271,7 +273,8 @@ TEST_F(SystemModalContainerLayoutManagerTest, EventFocusContainers) {
   Shell::GetInstance()->delegate()->LockScreen();
   EventTestWindow* lock_delegate = new EventTestWindow(false);
   scoped_ptr<aura::Window> lock(lock_delegate->OpenTestWindow(
-      Shell::GetInstance()->GetContainer(
+      Shell::GetContainer(
+          Shell::GetPrimaryRootWindow(),
           ash::internal::kShellWindowId_LockScreenContainer)));
   EXPECT_TRUE(wm::IsActiveWindow(lock.get()));
   e1.ClickLeftButton();
@@ -297,7 +300,8 @@ TEST_F(SystemModalContainerLayoutManagerTest, EventFocusContainers) {
 // is hidden.
 TEST_F(SystemModalContainerLayoutManagerTest, ShowModalWhileHidden) {
   // Hide the lock screen.
-  Shell::GetInstance()->GetContainer(
+  Shell::GetContainer(
+      Shell::GetPrimaryRootWindow(),
       internal::kShellWindowId_SystemModalContainer)->layer()->SetOpacity(0);
 
   // Create a modal window.