Fix crash bugs of FramePainter.

ash/wm/frame_painter_unittest.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/wm/frame_painter.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/property_util.h"
@@ skipping 105 matching lines @@
   scoped_ptr<FramePainter> painter(new FramePainter);
   ASSERT_TRUE(FramePainter::instances_);
   EXPECT_EQ(1u, FramePainter::instances_->size());
 
   // Destroying that painter leaves a valid pointer but no instances.
   painter.reset();
   ASSERT_TRUE(FramePainter::instances_);
   EXPECT_EQ(0u, FramePainter::instances_->size());
 }
 
+TEST_F(FramePainterTest, CreateAndDeleteSingleWindow) {
+  // Ensure that creating/deleting a window works well and doesn't cause
+  // crashes.  See crbug.com/155634
+  scoped_ptr<Widget> widget(CreateTestWidget());
+  scoped_ptr<FramePainter> painter(new FramePainter);
+  ImageButton size(NULL);
+  ImageButton close(NULL);
+  painter->Init(
+      widget.get(), NULL, &size, &close, FramePainter::SIZE_BUTTON_MAXIMIZES);
+  widget->Show();
+
+  // We only have one window, so it should use a solo header.
+  EXPECT_TRUE(painter->UseSoloWindowHeader());
+
+  // Close the window.
+  widget.reset();

[James Cook, 2012/10/16 20:51:46]

Maybe after this line assert that the root window property has been cleared?

[Jun Mukai, 2012/10/16 21:11:45]

Done.

+
+  // Recreate another window again.
+  painter.reset(new FramePainter);
+  widget.reset(CreateTestWidget());
+
+  painter->Init(
+      widget.get(), NULL, &size, &close, FramePainter::SIZE_BUTTON_MAXIMIZES);
+  widget->Show();
+  EXPECT_TRUE(painter->UseSoloWindowHeader());
+}
+
 TEST_F(FramePainterTest, UseSoloWindowHeader) {
   // Create a widget and a painter for it.
   scoped_ptr<Widget> w1(CreateTestWidget());
   FramePainter p1;
   ImageButton size1(NULL);
   ImageButton close1(NULL);
   p1.Init(w1.get(), NULL, &size1, &close1, FramePainter::SIZE_BUTTON_MAXIMIZES);
   w1->Show();
 
   // We only have one window, so it should use a solo header.
@@ skipping 218 matching lines @@
   EXPECT_EQ(HTRIGHT,
             p1.NonClientHitTest(frame, gfx::Point(screen.width() / 2,
                                                   screen.height() / 2)));
   // A hit into the middle lower area should generate right - not bottom&right.
   EXPECT_EQ(HTRIGHT,
             p1.NonClientHitTest(frame, gfx::Point(screen.width() / 2,
                                                   screen.height() - 1)));
 }
 
 }  // namespace ash