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

ash/desktop_background/desktop_background_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/desktop_background/desktop_background_controller.h"
 
 #include "ash/desktop_background/desktop_background_view.h"
 #include "ash/desktop_background/desktop_background_widget_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_factory.h"
@@ skipping 221 matching lines @@
 
 void DesktopBackgroundController::MoveDesktopToUnlockedContainer() {
   if (!locked_)
     return;
   locked_ = false;
   ReparentBackgroundWidgets(GetBackgroundContainerId(true),
                             GetBackgroundContainerId(false));
 }
 
 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() {
   desktop_background_mode_ = BACKGROUND_IMAGE;
   InstallComponentForAllWindows();
 }
 
 void DesktopBackgroundController::OnWallpaperLoadCompleted(
     scoped_refptr<WallpaperOperation> wo) {
   current_wallpaper_.reset(wo->ReleaseWallpaperData());
@@ skipping 84 matching lines @@
        iter != root_windows.end(); ++iter) {
     gfx::Size root_window_size = (*iter)->GetHostSize();
     if (root_window_size.width() > kSmallWallpaperMaximalWidth ||
         root_window_size.height() > kSmallWallpaperMaximalHeight)
       resolution = LARGE;
   }
   return resolution;
 }
 
 }  // namespace ash