Revert 151393 - Fix white flash when user signs out and fix wallpaper animation regression

ash/desktop_background/desktop_background_widget_controller.cc

Index: ash/desktop_background/desktop_background_widget_controller.cc
===================================================================
--- ash/desktop_background/desktop_background_widget_controller.cc	(revision 151397)
+++ ash/desktop_background/desktop_background_widget_controller.cc	(working copy)
@@ -8,14 +8,12 @@
 #include "ui/views/widget/widget.h"
 
 DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::DesktopBackgroundWidgetController*);
-DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::ComponentWrapper*);
 
 namespace ash {
 namespace internal {
 
 DEFINE_OWNED_WINDOW_PROPERTY_KEY(DesktopBackgroundWidgetController,
                                  kWindowDesktopComponent, NULL);
-DEFINE_OWNED_WINDOW_PROPERTY_KEY(ComponentWrapper, kComponentWrapper, NULL);
 
 DesktopBackgroundWidgetController::DesktopBackgroundWidgetController(
     views::Widget* widget) : widget_(widget) {
@@ -41,6 +39,7 @@
     layer_->SetBounds(bounds);
 }
 
+
 void DesktopBackgroundWidgetController::Reparent(aura::RootWindow* root_window,
                                                  int src_container,
                                                  int dest_container) {
@@ -54,9 +53,5 @@
   }
 }
 
-ComponentWrapper::ComponentWrapper(
-    DesktopBackgroundWidgetController* component) : component_(component) {
-}
-
 }  // namespace internal
 }  // namespace ash