Fix the problem that notifications and panels overlap.

chrome/browser/ui/panels/base_panel_browser_test.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 "chrome/browser/ui/panels/base_panel_browser_test.h"
 
 #include "chrome/browser/ui/browser_list.h"
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
@@ skipping 129 matching lines @@
 void MockAutoHidingDesktopBarImpl::NotifyVisibilityChange(
     AutoHidingDesktopBar::Alignment alignment,
     AutoHidingDesktopBar::Visibility visibility) {
   observer_->OnAutoHidingDesktopBarVisibilityChanged(alignment, visibility);
 }
 
 void MockAutoHidingDesktopBarImpl::NotifyThicknessChange() {
   observer_->OnAutoHidingDesktopBarThicknessChanged();
 }
 
+bool ExistsPanel(Panel* panel) {
+  const PanelManager::Panels& panels = PanelManager::GetInstance()->panels();
+  return find(panels.begin(), panels.end(), panel) != panels.end();
+}
+
 }  // namespace
 
 BasePanelBrowserTest::BasePanelBrowserTest()
     : InProcessBrowserTest(),
       testing_work_area_(0, 0, kTestingWorkAreaWidth,
                          kTestingWorkAreaHeight) {
 #if defined(OS_MACOSX)
   FindBarBridge::disable_animations_during_testing_ = true;
 #endif
 }
 
 BasePanelBrowserTest::~BasePanelBrowserTest() {
 }
 
 void BasePanelBrowserTest::SetUpCommandLine(CommandLine* command_line) {
   EnableDOMAutomation();
 }
 
 void BasePanelBrowserTest::SetUpOnMainThread() {
   InProcessBrowserTest::SetUpOnMainThread();
 
   // Setup the work area and desktop bar so that we have consistent testing
   // environment for all panel related tests.
   PanelManager* panel_manager = PanelManager::GetInstance();
   mock_auto_hiding_desktop_bar_ = new MockAutoHidingDesktopBarImpl(
       panel_manager);
   panel_manager->set_auto_hiding_desktop_bar(mock_auto_hiding_desktop_bar_);
-  panel_manager->SetWorkAreaForTesting(testing_work_area_);
+  // Do not use the testing work area if it is empty since we're going to
+  // use the actual work area in some testing scenarios.
+  if (!testing_work_area_.IsEmpty())
+    panel_manager->SetWorkAreaForTesting(testing_work_area_);
   panel_manager->enable_auto_sizing(false);
   panel_manager->remove_delays_for_testing();
   // This is needed so the subsequently created panels can be activated.
   // On a Mac, it transforms background-only test process into foreground one.
   EXPECT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
 }
 
+void BasePanelBrowserTest::WaitForPanelAdded(Panel* panel) {
+  if (ExistsPanel(panel))
+    return;
+  ui_test_utils::WindowedNotificationObserver signal(

[jennb, 2011/11/11 23:02:43]

Should create the signal first, then do the 'if (ExistsPanel...)' to avoid
possibility that panel is created after the check and before the signal is
created.

+      chrome::NOTIFICATION_PANEL_ADDED,
+      content::Source<Panel>(panel));
+  signal.Wait();
+  EXPECT_TRUE(ExistsPanel(panel));
+}
+
+void BasePanelBrowserTest::WaitForPanelRemoved(Panel* panel) {
+  if (!ExistsPanel(panel))
+    return;
+  ui_test_utils::WindowedNotificationObserver signal(
+      chrome::NOTIFICATION_PANEL_REMOVED,
+      content::Source<Panel>(panel));
+  signal.Wait();
+  EXPECT_FALSE(ExistsPanel(panel));
+}
+
 void BasePanelBrowserTest::WaitForPanelActiveState(
     Panel* panel, ActiveState expected_state) {
   DCHECK(expected_state == SHOW_AS_ACTIVE ||
          expected_state == SHOW_AS_INACTIVE);
   ui_test_utils::WindowedNotificationObserver signal(
       chrome::NOTIFICATION_PANEL_CHANGED_ACTIVE_STATUS,
       content::Source<Panel>(panel));
   if (panel->IsActive() == (expected_state == SHOW_AS_ACTIVE))
     return;  // Already in required state.
   signal.Wait();
@@ skipping 130 matching lines @@
   std::string error;
   scoped_refptr<Extension> extension = Extension::Create(
       full_path,  location, *input_value,
       Extension::STRICT_ERROR_CHECKS, &error);
   EXPECT_TRUE(extension.get());
   EXPECT_STREQ("", error.c_str());
   browser()->GetProfile()->GetExtensionService()->
       OnExtensionInstalled(extension.get(), false, -1);
   return extension;
 }