Revert "chromeos: Move files in //ash/common to //ash, part 3"

ash/common/wallpaper/wallpaper_controller.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/wallpaper/wallpaper_controller.h"
+#include "ash/common/wallpaper/wallpaper_controller.h"
 
 #include <string>
 #include <utility>
 
-#include "ash/ash_switches.h"
+#include "ash/common/ash_switches.h"
+#include "ash/common/wallpaper/wallpaper_controller_observer.h"
+#include "ash/common/wallpaper/wallpaper_delegate.h"
+#include "ash/common/wallpaper/wallpaper_view.h"
+#include "ash/common/wallpaper/wallpaper_widget_controller.h"
+#include "ash/common/wm_shell.h"
+#include "ash/common/wm_window.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
-#include "ash/wallpaper/wallpaper_controller_observer.h"
-#include "ash/wallpaper/wallpaper_delegate.h"
-#include "ash/wallpaper/wallpaper_view.h"
-#include "ash/wallpaper/wallpaper_widget_controller.h"
-#include "ash/wm_shell.h"
-#include "ash/wm_window.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/task_runner.h"
 #include "components/wallpaper/wallpaper_color_calculator.h"
 #include "components/wallpaper/wallpaper_resizer.h"
 #include "ui/display/manager/managed_display_info.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/color_analysis.h"
 #include "ui/views/widget/widget.h"
@@ skipping 318 matching lines @@
     color_calculator_->RemoveObserver(this);
 
   color_calculator_ = base::MakeUnique<wallpaper::WallpaperColorCalculator>(
       GetWallpaper(), luma, saturation, task_runner_);
   color_calculator_->AddObserver(this);
   if (!color_calculator_->StartCalculation())
     SetProminentColor(SK_ColorTRANSPARENT);
 }
 
 }  // namespace ash