Move DisplayManager and DisplayChangeObserverX11 from aura to ash.

ash/display/display_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/display/display_controller.h"
 
+#include "ash/display/display_manager.h"
 #include "ash/launcher/launcher.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/cursor_manager_test_api.h"
-#include "ui/aura/display_manager.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window_tracker.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace test {
 namespace {
@@ skipping 62 matching lines @@
 #define MAYBE_SecondaryDisplayLayout SecondaryDisplayLayout
 #define MAYBE_BoundsUpdated BoundsUpdated
 #define MAYBE_UpdateDisplayWithHostOrigin UpdateDisplayWithHostOrigin
 #endif
 
 TEST_F(DisplayControllerTest, MAYBE_SecondaryDisplayLayout) {
   TestObserver observer;
   UpdateDisplay("500x500,400x400");
   EXPECT_EQ(2, observer.CountAndReset());  // resize and add
   gfx::Display* secondary_display =
-      aura::Env::GetInstance()->display_manager()->GetDisplayAt(1);
+      Shell::GetInstance()->display_manager()->GetDisplayAt(1);
   gfx::Insets insets(5, 5, 5, 5);
   secondary_display->UpdateWorkAreaFromInsets(insets);
 
   // Default layout is RIGHT.
   EXPECT_EQ("0,0 500x500", GetPrimaryDisplay().bounds().ToString());
   EXPECT_EQ("500,0 400x400", GetSecondaryDisplay().bounds().ToString());
   EXPECT_EQ("505,5 390x390", GetSecondaryDisplay().work_area().ToString());
 
   // Layout the secondary display to the bottom of the primary.
   SetSecondaryDisplayLayout(DisplayLayout::BOTTOM);
@@ skipping 52 matching lines @@
 
 }
 
 TEST_F(DisplayControllerTest, MAYBE_BoundsUpdated) {
   TestObserver observer;
   SetSecondaryDisplayLayout(DisplayLayout::BOTTOM);
   UpdateDisplay("200x200,300x300");  // layout, resize and add.
   EXPECT_EQ(3, observer.CountAndReset());
 
   gfx::Display* secondary_display =
-      aura::Env::GetInstance()->display_manager()->GetDisplayAt(1);
+      Shell::GetInstance()->display_manager()->GetDisplayAt(1);
   gfx::Insets insets(5, 5, 5, 5);
   secondary_display->UpdateWorkAreaFromInsets(insets);
 
   EXPECT_EQ("0,0 200x200", GetPrimaryDisplay().bounds().ToString());
   EXPECT_EQ("0,200 300x300", GetSecondaryDisplay().bounds().ToString());
   EXPECT_EQ("5,205 290x290", GetSecondaryDisplay().work_area().ToString());
 
   UpdateDisplay("400x400,200x200");
   EXPECT_EQ(2, observer.CountAndReset());  // two resizes
   EXPECT_EQ("0,0 400x400", GetPrimaryDisplay().bounds().ToString());
@@ skipping 49 matching lines @@
 }
 
 TEST_F(DisplayControllerTest, SwapPrimary) {
   DisplayController* display_controller =
       Shell::GetInstance()->display_controller();
 
   UpdateDisplay("200x200,300x300");
   gfx::Display primary_display = Shell::GetScreen()->GetPrimaryDisplay();
   gfx::Display secondary_display = ScreenAsh::GetSecondaryDisplay();
 
-  std::string secondary_name = aura::Env::GetInstance()->
+  std::string secondary_name = Shell::GetInstance()->
       display_manager()->GetDisplayNameFor(secondary_display);
   DisplayLayout secondary_layout(DisplayLayout::RIGHT, 50);
   display_controller->SetLayoutForDisplayName(secondary_name, secondary_layout);
 
   EXPECT_NE(primary_display.id(), secondary_display.id());
   aura::RootWindow* primary_root =
       display_controller->GetRootWindowForDisplayId(primary_display.id());
   aura::RootWindow* secondary_root =
       display_controller->GetRootWindowForDisplayId(secondary_display.id());
   EXPECT_NE(primary_root, secondary_root);
@@ skipping 69 matching lines @@
 }
 
 TEST_F(DisplayControllerTest, SwapPrimaryById) {
   DisplayController* display_controller =
       Shell::GetInstance()->display_controller();
 
   UpdateDisplay("200x200,300x300");
   gfx::Display primary_display = Shell::GetScreen()->GetPrimaryDisplay();
   gfx::Display secondary_display = ScreenAsh::GetSecondaryDisplay();
 
-  std::string secondary_name = aura::Env::GetInstance()->
+  std::string secondary_name = Shell::GetInstance()->
       display_manager()->GetDisplayNameFor(secondary_display);
   DisplayLayout secondary_layout(DisplayLayout::RIGHT, 50);
   display_controller->SetLayoutForDisplayName(secondary_name, secondary_layout);
 
   EXPECT_NE(primary_display.id(), secondary_display.id());
   aura::RootWindow* primary_root =
       display_controller->GetRootWindowForDisplayId(primary_display.id());
   aura::RootWindow* secondary_root =
       display_controller->GetRootWindowForDisplayId(secondary_display.id());
   aura::Window* launcher_window =
@@ skipping 49 matching lines @@
             Shell::GetScreen()->GetDisplayNearestWindow(NULL).id());
   EXPECT_TRUE(tracker.Contains(primary_root));
   EXPECT_FALSE(tracker.Contains(secondary_root));
   EXPECT_TRUE(primary_root->Contains(launcher_window));
 
   // Adding 2nd display with the same ID.  The 2nd display should become primary
   // since secondary id is still stored as desirable_primary_id.
   std::vector<gfx::Display> displays;
   displays.push_back(primary_display);
   displays.push_back(secondary_display);
-  aura::DisplayManager* display_manager =
-      aura::Env::GetInstance()->display_manager();
+  internal::DisplayManager* display_manager =
+      Shell::GetInstance()->display_manager();
   display_manager->OnNativeDisplaysChanged(displays);
 
   EXPECT_EQ(2, Shell::GetScreen()->GetNumDisplays());
   EXPECT_EQ(secondary_display.id(),
             Shell::GetScreen()->GetPrimaryDisplay().id());
   EXPECT_EQ(primary_display.id(), ScreenAsh::GetSecondaryDisplay().id());
   EXPECT_EQ(
       primary_root,
       display_controller->GetRootWindowForDisplayId(secondary_display.id()));
   EXPECT_NE(
@@ skipping 105 matching lines @@
   UpdateDisplay("100+200-100x200,300+500-200x300");
   ASSERT_EQ(2, Shell::GetScreen()->GetNumDisplays());
   EXPECT_EQ("100,200", root_windows[0]->GetHostOrigin().ToString());
   EXPECT_EQ("100x200", root_windows[0]->GetHostSize().ToString());
   EXPECT_EQ("300,500", root_windows[1]->GetHostOrigin().ToString());
   EXPECT_EQ("200x300", root_windows[1]->GetHostSize().ToString());
 }
 
 }  // namespace test
 }  // namespace ash