Re-implement overscan & Implement Display Rotation

ash/test/ash_test_base.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/test/ash_test_base.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/ash_switches.h"
@@ skipping 37 matching lines @@
 namespace {
 
 class AshEventGeneratorDelegate : public aura::test::EventGeneratorDelegate {
  public:
   AshEventGeneratorDelegate() {}
   virtual ~AshEventGeneratorDelegate() {}
 
   // aura::test::EventGeneratorDelegate overrides:
   virtual aura::RootWindow* GetRootWindowAt(
       const gfx::Point& point_in_screen) const OVERRIDE {
-    gfx::Screen* screen = Shell::GetInstance()->screen();
+    gfx::Screen* screen = Shell::GetScreen();
     gfx::Display display = screen->GetDisplayNearestPoint(point_in_screen);
     return Shell::GetInstance()->display_controller()->
         GetRootWindowForDisplayId(display.id());
   }
 
   virtual aura::client::ScreenPositionClient* GetScreenPositionClient(
       const aura::Window* window) const OVERRIDE {
     return aura::client::GetScreenPositionClient(window->GetRootWindow());
   }
 
@@ skipping 31 matching lines @@
 
   // Creates Shell and hook with Desktop.
   test_shell_delegate_ = new TestShellDelegate;
 
 #if defined(ENABLE_MESSAGE_CENTER)
   // Creates MessageCenter since g_browser_process is not created in AshTestBase
   // tests.
   message_center::MessageCenter::Initialize();
 #endif
   ash::Shell::CreateInstance(test_shell_delegate_);
+  Shell* shell = Shell::GetInstance();
+  test::DisplayManagerTestApi(shell->display_manager()).
+      DisableChangeDisplayUponHostResize();
+
   Shell::GetPrimaryRootWindow()->Show();
   Shell::GetPrimaryRootWindow()->ShowRootWindow();
   // Move the mouse cursor to far away so that native events doesn't
   // interfere test expectations.
   Shell::GetPrimaryRootWindow()->MoveCursorTo(gfx::Point(-1000, -1000));
-  Shell::GetInstance()->cursor_manager()->EnableMouseEvents();
+  shell->cursor_manager()->EnableMouseEvents();
 
 #if defined(OS_WIN)
   if (base::win::GetVersion() >= base::win::VERSION_WIN8) {
     metro_viewer_host_.reset(new TestMetroViewerProcessHost("viewer"));
     ASSERT_TRUE(
         metro_viewer_host_->LaunchViewerAndWaitForConnection(
             win8::test::kDefaultTestAppUserModelId));
     aura::RemoteRootWindowHostWin* root_window_host =
         aura::RemoteRootWindowHostWin::Instance();
     ASSERT_TRUE(root_window_host != NULL);
@@ skipping 139 matching lines @@
 void AshTestBase::SetUserLoggedIn(bool user_logged_in) {
   test_shell_delegate_->SetUserLoggedIn(user_logged_in);
 }
 
 void AshTestBase::SetCanLockScreen(bool can_lock_screen) {
   test_shell_delegate_->SetCanLockScreen(can_lock_screen);
 }
 
 }  // namespace test
 }  // namespace ash