Move DisplayManager and DisplayChangeObserverX11 from aura to ash.

chrome/browser/chromeos/login/wallpaper_manager_browsertest.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 "chrome/browser/chromeos/login/wallpaper_manager.h"
 
 #include "ash/desktop_background/desktop_background_resources.h"
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/desktop_background/desktop_background_controller_observer.h"
-#include "ash/display/multi_display_manager.h"
+#include "ash/display/display_manager.h"
 #include "ash/shell.h"
-#include "ash/test/multi_display_manager_test_api.h"
+#include "ash/test/display_manager_test_api.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
 #include "base/time.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"
 #include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "ui/aura/env.h"
-#include "ui/aura/display_manager.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using namespace ash;
 
 namespace chromeos {
 
 namespace {
 
 const char kTestUser1[] = "test-user@example.com";
 
@@ skipping 29 matching lines @@
     local_state_ = g_browser_process->local_state();
     UpdateDisplay("800x600");
   }
 
   virtual void CleanUpOnMainThread() OVERRIDE {
     controller_->RemoveObserver(this);
     controller_ = NULL;
   }
 
   // Update the display configuration as given in |display_specs|.
-  // See ash::test::MultiDisplayManagerTestApi::UpdateDisplay for more
+  // See ash::test::DisplayManagerTestApi::UpdateDisplay for more
   // details.
   void UpdateDisplay(const std::string& display_specs) {
-    internal::MultiDisplayManager* multi_display_manager =
-        static_cast<internal::MultiDisplayManager*>(
-            aura::Env::GetInstance()->display_manager());
-    ash::test::MultiDisplayManagerTestApi multi_display_manager_test_api(
-        multi_display_manager);
-    multi_display_manager_test_api.UpdateDisplay(display_specs);
+    ash::test::DisplayManagerTestApi display_manager_test_api(
+        ash::Shell::GetInstance()->display_manager());
+    display_manager_test_api.UpdateDisplay(display_specs);
   }
 
   void WaitAsyncWallpaperLoad() {
     MessageLoop::current()->Run();
   }
 
   virtual void OnWallpaperDataChanged() OVERRIDE {
     MessageLoop::current()->Quit();
   }
 
@@ skipping 122 matching lines @@
   UpdateDisplay("800x600,2000x2000");
   WaitAsyncWallpaperLoad();
   wallpaper = controller_->GetWallpaper();
 
   // The large resolution custom wallpaper is expected.
   EXPECT_EQ(kExpectedLargeWallpaperWidth, wallpaper.width());
   EXPECT_EQ(kExpectedLargeWallpaperHeight, wallpaper.height());
 }
 
 }  // namepace chromeos