mash: Partially migrate ash/desktop_background to ash common types.

ash/desktop_background/desktop_background_controller_unittest.cc

Index: ash/desktop_background/desktop_background_controller_unittest.cc
diff --git a/ash/desktop_background/desktop_background_controller_unittest.cc b/ash/desktop_background/desktop_background_controller_unittest.cc
index 76c259d365db59ce6ae88da1b6669e7922ba6f05..28fe7072a5fb91b130612c91a90b0cd12a3d8a15 100644
--- a/ash/desktop_background/desktop_background_controller_unittest.cc
+++ b/ash/desktop_background/desktop_background_controller_unittest.cc
@@ -7,7 +7,6 @@
 #include <cmath>
 #include <cstdlib>
 
-#include "ash/common/ash_switches.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/desktop_background/desktop_background_view.h"
 #include "ash/desktop_background/desktop_background_widget_controller.h"
@@ -19,18 +18,13 @@
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/threading/sequenced_worker_pool.h"
-#include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColor.h"
-#include "ui/aura/window_event_dispatcher.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/compositor/test/layer_animator_test_controller.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/widget/widget.h"
 
-using aura::RootWindow;
-using aura::Window;
-using wallpaper::WallpaperLayout;
 using wallpaper::WALLPAPER_LAYOUT_CENTER;
 using wallpaper::WALLPAPER_LAYOUT_CENTER_CROPPED;
 using wallpaper::WALLPAPER_LAYOUT_STRETCH;
@@ -46,8 +40,8 @@ const int kLockScreenBackgroundId =
 
 // Returns number of child windows in a shell window container.
 int ChildCountForContainer(int container_id) {
-  Window* root = ash::Shell::GetPrimaryRootWindow();
-  Window* container = root->GetChildById(container_id);
+  aura::Window* root = ash::Shell::GetPrimaryRootWindow();
+  aura::Window* container = root->GetChildById(container_id);
   return static_cast<int>(container->children().size());
 }