Introdcue AshWindowTreeHost and move ash/chrome specific code in WTH to ash.

ash/root_window_controller_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/root_window_controller.h"
 
 #include "ash/session_state_delegate.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
@@ skipping 274 matching lines @@
   generator_1st.ClickLeftButton();
   EXPECT_TRUE(wm::IsActiveWindow(modal->GetNativeView()));
 }
 
 TEST_F(RootWindowControllerTest, ModalContainer) {
   UpdateDisplay("600x600");
   Shell* shell = Shell::GetInstance();
   RootWindowController* controller = shell->GetPrimaryRootWindowController();
   EXPECT_EQ(user::LOGGED_IN_USER,
             shell->system_tray_delegate()->GetUserLoginStatus());
-  EXPECT_EQ(Shell::GetContainer(controller->root_window(),
-                                kShellWindowId_SystemModalContainer)
+  EXPECT_EQ(controller->GetContainer(kShellWindowId_SystemModalContainer)
                 ->layout_manager(),
             controller->GetSystemModalLayoutManager(NULL));
 
   views::Widget* session_modal_widget =
       CreateModalWidget(gfx::Rect(300, 10, 100, 100));
-  EXPECT_EQ(Shell::GetContainer(controller->root_window(),
-                                kShellWindowId_SystemModalContainer)
+  EXPECT_EQ(controller->GetContainer(kShellWindowId_SystemModalContainer)
                 ->layout_manager(),
             controller->GetSystemModalLayoutManager(
                 session_modal_widget->GetNativeView()));
 
   shell->session_state_delegate()->LockScreen();
   EXPECT_EQ(user::LOGGED_IN_LOCKED,
             shell->system_tray_delegate()->GetUserLoginStatus());
-  EXPECT_EQ(Shell::GetContainer(controller->root_window(),
-                                kShellWindowId_LockSystemModalContainer)
+  EXPECT_EQ(controller->GetContainer(kShellWindowId_LockSystemModalContainer)
                 ->layout_manager(),
             controller->GetSystemModalLayoutManager(NULL));
 
-  aura::Window* lock_container = Shell::GetContainer(
-      controller->root_window(), kShellWindowId_LockScreenContainer);
+  aura::Window* lock_container =
+      controller->GetContainer(kShellWindowId_LockScreenContainer);
   views::Widget* lock_modal_widget =
       CreateModalWidgetWithParent(gfx::Rect(300, 10, 100, 100), lock_container);
-  EXPECT_EQ(Shell::GetContainer(controller->root_window(),
-                                kShellWindowId_LockSystemModalContainer)
+  EXPECT_EQ(controller->GetContainer(kShellWindowId_LockSystemModalContainer)
                 ->layout_manager(),
             controller->GetSystemModalLayoutManager(
                 lock_modal_widget->GetNativeView()));
-  EXPECT_EQ(Shell::GetContainer(controller->root_window(),
-                                kShellWindowId_SystemModalContainer)
+  EXPECT_EQ(controller->GetContainer(kShellWindowId_SystemModalContainer)
                 ->layout_manager(),
             controller->GetSystemModalLayoutManager(
                 session_modal_widget->GetNativeView()));
 
   shell->session_state_delegate()->UnlockScreen();
 }
 
 TEST_F(RootWindowControllerTest, ModalContainerNotLoggedInLoggedIn) {
   UpdateDisplay("600x600");
   Shell* shell = Shell::GetInstance();
 
   // Configure login screen environment.
   SetUserLoggedIn(false);
   EXPECT_EQ(user::LOGGED_IN_NONE,
             shell->system_tray_delegate()->GetUserLoginStatus());
   EXPECT_EQ(0, shell->session_state_delegate()->NumberOfLoggedInUsers());
   EXPECT_FALSE(shell->session_state_delegate()->IsActiveUserSessionStarted());
 
   RootWindowController* controller = shell->GetPrimaryRootWindowController();
-  EXPECT_EQ(Shell::GetContainer(controller->root_window(),
-                                kShellWindowId_LockSystemModalContainer)
+  EXPECT_EQ(controller->GetContainer(kShellWindowId_LockSystemModalContainer)
                 ->layout_manager(),
             controller->GetSystemModalLayoutManager(NULL));
 
-  aura::Window* lock_container = Shell::GetContainer(
-      controller->root_window(), kShellWindowId_LockScreenContainer);
+  aura::Window* lock_container =
+      controller->GetContainer(kShellWindowId_LockScreenContainer);
   views::Widget* login_modal_widget =
       CreateModalWidgetWithParent(gfx::Rect(300, 10, 100, 100), lock_container);
-  EXPECT_EQ(Shell::GetContainer(controller->root_window(),
-                                kShellWindowId_LockSystemModalContainer)
+  EXPECT_EQ(controller->GetContainer(kShellWindowId_LockSystemModalContainer)
                 ->layout_manager(),
             controller->GetSystemModalLayoutManager(
                 login_modal_widget->GetNativeView()));
   login_modal_widget->Close();
 
   // Configure user session environment.
   SetUserLoggedIn(true);
   SetSessionStarted(true);
   EXPECT_EQ(user::LOGGED_IN_USER,
             shell->system_tray_delegate()->GetUserLoginStatus());
   EXPECT_EQ(1, shell->session_state_delegate()->NumberOfLoggedInUsers());
   EXPECT_TRUE(shell->session_state_delegate()->IsActiveUserSessionStarted());
-  EXPECT_EQ(Shell::GetContainer(controller->root_window(),
-                                kShellWindowId_SystemModalContainer)
+  EXPECT_EQ(controller->GetContainer(kShellWindowId_SystemModalContainer)
                 ->layout_manager(),
             controller->GetSystemModalLayoutManager(NULL));
 
   views::Widget* session_modal_widget =
         CreateModalWidget(gfx::Rect(300, 10, 100, 100));
-  EXPECT_EQ(Shell::GetContainer(controller->root_window(),
-                                kShellWindowId_SystemModalContainer)
+  EXPECT_EQ(controller->GetContainer(kShellWindowId_SystemModalContainer)
                 ->layout_manager(),
             controller->GetSystemModalLayoutManager(
                 session_modal_widget->GetNativeView()));
 }
 
 TEST_F(RootWindowControllerTest, ModalContainerBlockedSession) {
   UpdateDisplay("600x600");
   Shell* shell = Shell::GetInstance();
   RootWindowController* controller = shell->GetPrimaryRootWindowController();
-  aura::Window* lock_container = Shell::GetContainer(
-      controller->root_window(), kShellWindowId_LockScreenContainer);
+  aura::Window* lock_container =
+      controller->GetContainer(kShellWindowId_LockScreenContainer);
   for (int block_reason = FIRST_BLOCK_REASON;
        block_reason < NUMBER_OF_BLOCK_REASONS;
        ++block_reason) {
     views::Widget* session_modal_widget =
           CreateModalWidget(gfx::Rect(300, 10, 100, 100));
-    EXPECT_EQ(Shell::GetContainer(controller->root_window(),
-                                  kShellWindowId_SystemModalContainer)
+    EXPECT_EQ(controller->GetContainer(kShellWindowId_SystemModalContainer)
                   ->layout_manager(),
               controller->GetSystemModalLayoutManager(
                   session_modal_widget->GetNativeView()));
-    EXPECT_EQ(Shell::GetContainer(controller->root_window(),
-                                  kShellWindowId_SystemModalContainer)
+    EXPECT_EQ(controller->GetContainer(kShellWindowId_SystemModalContainer)
                   ->layout_manager(),
               controller->GetSystemModalLayoutManager(NULL));
     session_modal_widget->Close();
 
     BlockUserSession(static_cast<UserSessionBlockReason>(block_reason));
 
-    EXPECT_EQ(Shell::GetContainer(controller->root_window(),
-                                  kShellWindowId_LockSystemModalContainer)
+    EXPECT_EQ(controller->GetContainer(kShellWindowId_LockSystemModalContainer)
                   ->layout_manager(),
               controller->GetSystemModalLayoutManager(NULL));
 
     views::Widget* lock_modal_widget =
         CreateModalWidgetWithParent(gfx::Rect(300, 10, 100, 100),
                                     lock_container);
-    EXPECT_EQ(Shell::GetContainer(controller->root_window(),
-                                  kShellWindowId_LockSystemModalContainer)
+    EXPECT_EQ(controller->GetContainer(kShellWindowId_LockSystemModalContainer)
                   ->layout_manager(),
               controller->GetSystemModalLayoutManager(
                   lock_modal_widget->GetNativeView()));
 
     session_modal_widget =
           CreateModalWidget(gfx::Rect(300, 10, 100, 100));
-    EXPECT_EQ(Shell::GetContainer(controller->root_window(),
-                                  kShellWindowId_SystemModalContainer)
+    EXPECT_EQ(controller->GetContainer(kShellWindowId_SystemModalContainer)
                   ->layout_manager(),
               controller->GetSystemModalLayoutManager(
                   session_modal_widget->GetNativeView()));
     session_modal_widget->Close();
 
     lock_modal_widget->Close();
     UnblockUserSession();
   }
 }
 
@@ skipping 37 matching lines @@
   Shell::RootWindowControllerList controllers =
       Shell::GetInstance()->GetAllRootWindowControllers();
 
   Widget* w1 = CreateTestWidget(gfx::Rect(0, 0, 100, 100));
   w1->Maximize();
   Widget* w2 = CreateTestWidget(gfx::Rect(0, 0, 100, 100));
   w2->SetFullscreen(true);
   Widget* w3 = CreateTestWidget(gfx::Rect(600, 0, 100, 100));
 
   EXPECT_EQ(w1->GetNativeWindow()->GetRootWindow(),
-      controllers[0]->root_window());
+            controllers[0]->GetRootWindow());
   EXPECT_EQ(w2->GetNativeWindow()->GetRootWindow(),
-      controllers[0]->root_window());
+            controllers[0]->GetRootWindow());
   EXPECT_EQ(w3->GetNativeWindow()->GetRootWindow(),
-      controllers[1]->root_window());
+            controllers[1]->GetRootWindow());
 
   w1->Activate();
   EXPECT_EQ(NULL, controllers[0]->GetWindowForFullscreenMode());
   EXPECT_EQ(NULL, controllers[1]->GetWindowForFullscreenMode());
 
   w2->Activate();
   EXPECT_EQ(w2->GetNativeWindow(),
             controllers[0]->GetWindowForFullscreenMode());
   EXPECT_EQ(NULL, controllers[1]->GetWindowForFullscreenMode());
 
   // Verify that the first root window controller remains in fullscreen mode
   // when a window on the other display is activated.
   w3->Activate();
   EXPECT_EQ(w2->GetNativeWindow(),
             controllers[0]->GetWindowForFullscreenMode());
   EXPECT_EQ(NULL, controllers[1]->GetWindowForFullscreenMode());
 }
 
 // Test that user session window can't be focused if user session blocked by
 // some overlapping UI.
 TEST_F(RootWindowControllerTest, FocusBlockedWindow) {
   UpdateDisplay("600x600");
   RootWindowController* controller =
       Shell::GetInstance()->GetPrimaryRootWindowController();
-  aura::Window* lock_container = Shell::GetContainer(
-      controller->root_window(), kShellWindowId_LockScreenContainer);
+  aura::Window* lock_container =
+      controller->GetContainer(kShellWindowId_LockScreenContainer);
   aura::Window* lock_window = Widget::CreateWindowWithParentAndBounds(NULL,
       lock_container, gfx::Rect(0, 0, 100, 100))->GetNativeView();
   lock_window->Show();
   aura::Window* session_window =
       CreateTestWidget(gfx::Rect(0, 0, 100, 100))->GetNativeView();
   session_window->Show();
 
   for (int block_reason = FIRST_BLOCK_REASON;
        block_reason < NUMBER_OF_BLOCK_REASONS;
        ++block_reason) {
@@ skipping 245 matching lines @@
 
   modal_widget->Close();
 
   // Verify that mouse events are now unblocked to the root window.
   root_window_event_generator.ClickLeftButton();
   EXPECT_EQ(2, handler->num_mouse_events() / 2);
 }
 
 }  // namespace test
 }  // namespace ash