Fix panels being removed from PanelManager prematurely.

chrome/browser/ui/panels/panel_browser_view_browsertest.cc

 // Copyright (c) 2011 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 "base/i18n/time_formatting.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/panels/base_panel_browser_test.h"
@@ skipping 144 matching lines @@
 
   void WaitTillSettingsAnimationFinished(Panel* panel) {
     // The timer for the animation will only kick in as async task.
     while (GetSettingsButtonAnimator(panel)->is_animating()) {
       MessageLoopForUI::current()->PostTask(FROM_HERE,
                                             new MessageLoop::QuitTask());
       MessageLoopForUI::current()->RunAllPending();
     }
   }
 
+  void ClosePanelAndWaitForNotification(Panel* panel) {
+    ui_test_utils::WindowedNotificationObserver signal(
+        chrome::NOTIFICATION_PANEL_DELETED,

[jennb, 2011/11/11 21:33:16]

Should use BROWSER_CLOSED notification here to verify that whenever a browser is
closed, the panel is also removed from the panel manager.

[prasadt, 2011/11/11 22:02:44]

Done.

+        content::Source<Panel>(panel));
+    panel->Close();
+    signal.Wait();
+  }
+
   // We put all the testing logic in this class instead of the test so that
   // we do not need to declare each new test as a friend of PanelBrowserView
   // for the purpose of accessing its private members.
   void TestMinimizeAndRestore(bool enable_auto_hiding) {
     PanelManager* panel_manager = PanelManager::GetInstance();
     int expected_bottom_on_minimized = testing_work_area().height();
     int expected_bottom_on_unminimized = expected_bottom_on_minimized;
 
     // Turn on auto-hiding if requested.
     static const int bottom_thickness = 40;
@@ skipping 109 matching lines @@
     EXPECT_EQ(2, panel_manager->minimized_panel_count());
     EXPECT_FALSE(panel_manager->ShouldBringUpTitlebars(
         0, 0));
     browser_view1->OnTitlebarMousePressed(panel1->GetBounds().origin());
     browser_view1->OnTitlebarMouseDragged(
         panel1->GetBounds().origin().Subtract(gfx::Point(5, 5)));
     EXPECT_TRUE(panel_manager->ShouldBringUpTitlebars(
         0, 0));
     browser_view1->OnTitlebarMouseReleased();
 
-    panel1->Close();
-    panel2->Close();
-    panel3->Close();
+    ClosePanelAndWaitForNotification(panel1);
+    ClosePanelAndWaitForNotification(panel2);
+    ClosePanelAndWaitForNotification(panel3);
     EXPECT_EQ(0, panel_manager->minimized_panel_count());
   }
 
   void TestDrawAttention() {
     Panel* panel = CreatePanel("PanelTest");
     PanelBrowserView* browser_view = GetBrowserView(panel);
     PanelBrowserFrameView* frame_view = browser_view->GetFrameView();
     frame_view->title_label_->SetAutoColorReadabilityEnabled(false);
     SkColor attention_color = frame_view->GetTitleColor(
         PanelBrowserFrameView::PAINT_FOR_ATTENTION);
@@ skipping 299 matching lines @@
 // TODO(jianli): Investigate why this fails on win trunk build.
 // http://crbug.com/102734
 IN_PROC_BROWSER_TEST_F(PanelBrowserViewTest, DISABLED_DrawAttention) {
   TestDrawAttention();
 }
 
 IN_PROC_BROWSER_TEST_F(PanelBrowserViewTest, ChangeAutoHideTaskBarThickness) {
   TestChangeAutoHideTaskBarThickness();
 }
 #endif