Fix memory leak on Chromium OS Heapcheck and Chromium OS (valgrind)

ash/desktop_background/desktop_background_controller.cc

Index: ash/desktop_background/desktop_background_controller.cc
diff --git a/ash/desktop_background/desktop_background_controller.cc b/ash/desktop_background/desktop_background_controller.cc
index 917e0abe795fad5b810ff74aed4ad66844ab424d..f83d9b469ade93a3a26614d69d37869edd4ee516 100644
--- a/ash/desktop_background/desktop_background_controller.cc
+++ b/ash/desktop_background/desktop_background_controller.cc
@@ -239,10 +239,14 @@ void DesktopBackgroundController::MoveDesktopToUnlockedContainer() {
 }
 
 void DesktopBackgroundController::OnWindowDestroying(aura::Window* window) {
-   window->SetProperty(internal::kWindowDesktopComponent,
-       static_cast<internal::DesktopBackgroundWidgetController*>(NULL));
-   window->SetProperty(internal::kComponentWrapper,
-       static_cast<internal::ComponentWrapper*>(NULL));
+  if (window->GetProperty(internal::kComponentWrapper) &&

[sky, 2012/08/15 15:05:11]

Why the double check here? Shouldn't you only need one? Also, I think this would
be less error prone if the wrapper owned the window until release was invoked on
the wrapper. That way you shouldn't have to do anything special here.

[bshe, 2012/08/15 15:12:42]

Some of the tests destroying window without even creating a wrapper. So I have
the double check here. I will make the wrapper own the window as you suggested.
Thanks!

On 2012/08/15 15:05:11, sky wrote:

+      (window->GetProperty(internal::kWindowDesktopComponent) !=
+       window->GetProperty(internal::kComponentWrapper)->component()))
+    delete window->GetProperty(internal::kComponentWrapper)->component();
+  window->SetProperty(internal::kWindowDesktopComponent,
+      static_cast<internal::DesktopBackgroundWidgetController*>(NULL));
+  window->SetProperty(internal::kComponentWrapper,
+      static_cast<internal::ComponentWrapper*>(NULL));
 }
 
 void DesktopBackgroundController::SetDesktopBackgroundImageMode() {