ash: Add tests for desktop background, fix names

* Add basic unit tests for DesktopBackgroundController
* Add test for race condition between Chrome OS resume from
sleep/wallpaper refresh and screen unlock.  See bug.
* Rename ComponentWrapper class to AnimatingDesktopController
* Rename kComponentWrapper key to kAnimatingDesktopController
* Rename kWindowDesktopComponent key to kDesktopController
* Fix lots of component vs. controller names

BUG=149043
TEST=added DesktopBackgroundControllerTest.*


Review URL: https://chromiumcodereview.appspot.com/11026047

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160449 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 15 insertions, 10 deletions

diff --git a/ash/desktop_background/desktop_background_widget_controller.cc b/ash/desktop_background/desktop_background_widget_controller.cc
index 6b796d0..dd247ee 100644
--- a/ash/desktop_background/desktop_background_widget_controller.cc
+++ b/ash/desktop_background/desktop_background_widget_controller.cc
@@ -4,18 +4,23 @@
 
 #include "ash/desktop_background/desktop_background_widget_controller.h"
 
+#include "ash/ash_export.h"
 #include "ui/aura/root_window.h"
 #include "ui/views/widget/widget.h"
 
-DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::DesktopBackgroundWidgetController*);
-DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::ComponentWrapper*);
+// Exported for tests.
+DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(
+    ASH_EXPORT, ash::internal::DesktopBackgroundWidgetController*);
+DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(
+    ASH_EXPORT, ash::internal::AnimatingDesktopController*);
 
 namespace ash {
 namespace internal {
 
 DEFINE_OWNED_WINDOW_PROPERTY_KEY(DesktopBackgroundWidgetController,
-                                 kWindowDesktopComponent, NULL);
-DEFINE_OWNED_WINDOW_PROPERTY_KEY(ComponentWrapper, kComponentWrapper, NULL);
+                                 kDesktopController, NULL);
+DEFINE_OWNED_WINDOW_PROPERTY_KEY(AnimatingDesktopController,
+                                 kAnimatingDesktopController, NULL);
 
 DesktopBackgroundWidgetController::DesktopBackgroundWidgetController(
     views::Widget* widget) : widget_(widget) {
@@ -67,19 +72,19 @@ bool DesktopBackgroundWidgetController::Reparent(aura::RootWindow* root_window,
   return false;
 }
 
-ComponentWrapper::ComponentWrapper(
+AnimatingDesktopController::AnimatingDesktopController(
     DesktopBackgroundWidgetController* component) {
-  component_.reset(component);
+  controller_.reset(component);
 }
 
-ComponentWrapper::~ComponentWrapper() {
+AnimatingDesktopController::~AnimatingDesktopController() {
 }
 
-DesktopBackgroundWidgetController* ComponentWrapper::GetComponent(
+DesktopBackgroundWidgetController* AnimatingDesktopController::GetController(
     bool pass_ownership) {
   if (pass_ownership)
-    return component_.release();
-  return component_.get();
+    return controller_.release();
+  return controller_.get();
 }
 
 }  // namespace internal