Panels test cleanup.

chrome/browser/ui/panels/base_panel_browser_test.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 "chrome/browser/ui/panels/base_panel_browser_test.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
@@ skipping 253 matching lines @@
       content::Source<Panel>(panel));
   if (panel_testing->IsWindowSizeKnown())
     return;
   signal.Wait();
   EXPECT_TRUE(panel_testing->IsWindowSizeKnown());
 }
 
 void BasePanelBrowserTest::WaitForBoundsAnimationFinished(Panel* panel) {
   scoped_ptr<NativePanelTesting> panel_testing(
       CreateNativePanelTesting(panel));
-  content::WindowedNotificationObserver signal(
-      chrome::NOTIFICATION_PANEL_BOUNDS_ANIMATIONS_FINISHED,
-      content::Source<Panel>(panel));
-  if (!panel_testing->IsAnimatingBounds())
-    return;
-  signal.Wait();
-  EXPECT_TRUE(!panel_testing->IsAnimatingBounds());
-}
-
-void BasePanelBrowserTest::WaitForExpansionStateChanged(
-    Panel* panel, Panel::ExpansionState expansion_state) {
-  content::WindowedNotificationObserver signal(
-      chrome::NOTIFICATION_PANEL_CHANGED_EXPANSION_STATE,
-      content::Source<Panel>(panel));
-  if (panel->expansion_state() == expansion_state)
-    return;
-  signal.Wait();
-  EXPECT_EQ(expansion_state, panel->expansion_state());
+  // Sometimes there are several animations in sequence due to content
+  // auto resizing. Wait for all animations to finish.
+  while (panel_testing->IsAnimatingBounds()) {
+    content::WindowedNotificationObserver signal(
+        chrome::NOTIFICATION_PANEL_BOUNDS_ANIMATIONS_FINISHED,
+        content::Source<Panel>(panel));
+    if (!panel_testing->IsAnimatingBounds())
+      return;
+    signal.Wait();
+  }
 }
 
 BasePanelBrowserTest::CreatePanelParams::CreatePanelParams(
     const std::string& name,
     const gfx::Rect& bounds,
     ActiveState show_flag)
     : name(name),
       bounds(bounds),
       show_flag(show_flag),
       wait_for_fully_created(true),
@@ skipping 182 matching lines @@
 }
 
 void BasePanelBrowserTest::MoveMouse(const gfx::Point& position) {
   PanelManager::GetInstance()->mouse_watcher()->NotifyMouseMovement(position);
 }
 
 std::string BasePanelBrowserTest::MakePanelName(int index) {
   std::string panel_name("Panel");
   return panel_name + base::IntToString(index);
 }