Fix flaky linux panel tests related to active state checks

chrome/browser/ui/panels/old_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/old_base_panel_browser_test.h"
 
 #include "chrome/browser/ui/browser_list.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 237 matching lines @@
     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();
   // Verify that transition happened in the desired direction.
-  EXPECT_TRUE(panel->IsActive() == (expected_state == SHOW_AS_ACTIVE));
+  bool expect_active = (expected_state == SHOW_AS_ACTIVE);
+  bool is_active = panel->IsActive();
+  EXPECT_TRUE(expect_active == is_active);

[dcheng, 2012/07/03 23:04:25]

EXPECT_EQ

+  if (expect_active != is_active) {
+    LOG(WARNING) << "Expected active: " << expect_active

[dcheng, 2012/07/03 23:04:25]

Did you mean to print this out in two different formats?

+                 << (expect_active ? " y" : " n")
+                 << " but actual is: " << is_active
+                 << (is_active ? " y" : " n")
+                 << " for panel: " << panel->app_name();
+  }
 }
 
 void OldBasePanelBrowserTest::WaitForWindowSizeAvailable(Panel* panel) {
   scoped_ptr<NativePanelTesting> panel_testing(
       CreateNativePanelTesting(panel));
   ui_test_utils::WindowedNotificationObserver signal(
       chrome::NOTIFICATION_PANEL_WINDOW_SIZE_KNOWN,
       content::Source<Panel>(panel));
   if (panel_testing->IsWindowSizeKnown())
     return;
@@ skipping 62 matching lines @@
     EXPECT_TRUE(panel->auto_resizable());
   }
 
   if (params.show_flag == SHOW_AS_ACTIVE) {
     panel->Show();
   } else {
     panel->ShowInactive();
   }
 
   if (params.wait_for_fully_created) {
-    MessageLoopForUI::current()->RunAllPending();
-
 #if defined(OS_LINUX)
     // On bots, we might have a simple window manager which always activates new
     // windows, and can't always deactivate them. Re-activate the main tabbed
     // browser to "deactivate" the newly created panel.
     if (params.expected_active_state == SHOW_AS_INACTIVE &&
         ui::GuessWindowManager() == ui::WM_ICE_WM) {
+      // Wait for new panel to become active before deactivating to ensure
+      // the activated notification is consumed before we wait for the panel
+      // to become inactive.
+      LOG(INFO) << "waiting for new to be active before deactivating";
+      WaitForPanelActiveState(panel, SHOW_AS_ACTIVE);
+      LOG(INFO) << "got initial active state";
       browser()->window()->Activate();
     }
 #endif
     // More waiting, because gaining or losing focus may require inter-process
     // asynchronous communication, and it is not enough to just run the local
     // message loop to make sure this activity has completed.
+    LOG(INFO) << "waiting for actual created active state";
     WaitForPanelActiveState(panel, params.expected_active_state);
+    LOG(INFO) << "got created active state";
 
     // On Linux, window size is not available right away and we should wait
     // before moving forward with the test.
     WaitForWindowSizeAvailable(panel);
 
     // Wait for the bounds animations on creation to finish.
     WaitForBoundsAnimationFinished(panel);
   }
 
   return panel;
@@ skipping 114 matching lines @@
 }
 
 void OldBasePanelBrowserTest::MoveMouse(const gfx::Point& position) {
   PanelManager::GetInstance()->mouse_watcher()->NotifyMouseMovement(position);
 }
 
 std::string OldBasePanelBrowserTest::MakePanelName(int index) {
   std::string panel_name("Panel");
   return panel_name + base::IntToString(index);
 }