Revert 151353 - Panels refactor: Support browserless panels on Linux.

chrome/browser/ui/panels/panel_browsertest.cc

Index: chrome/browser/ui/panels/panel_browsertest.cc
===================================================================
--- chrome/browser/ui/panels/panel_browsertest.cc	(revision 151357)
+++ chrome/browser/ui/panels/panel_browsertest.cc	(working copy)
@@ -24,7 +24,6 @@
 #include "chrome/browser/ui/panels/native_panel.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
-#include "chrome/browser/ui/panels/test_panel_active_state_observer.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_notification_types.h"
@@ -43,6 +42,9 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/screen.h"
 
+// Refactor has only been done for Win and Mac panels so far.
+#if defined(OS_WIN) || defined(OS_MACOSX)
+
 using content::BrowserContext;
 using content::BrowserThread;
 using content::DownloadItem;
@@ -1273,9 +1275,9 @@
   Panel* panel = CreatePanelWithParams(params);
   EXPECT_EQ(Panel::EXPANDED, panel->expansion_state());
 
-  PanelActiveStateObserver signal(panel, false);
-  panel->Minimize();
-  signal.Wait();
+  panel->SetExpansionState(Panel::MINIMIZED);
+  MessageLoop::current()->RunAllPending();
+  WaitForPanelActiveState(panel, SHOW_AS_INACTIVE);
   panel->Close();
 }
 
@@ -1591,3 +1593,4 @@
   EXPECT_EQ(0, panel_manager->num_panels());
 }
 
+#endif // OS_WIN || OS_MACOSX
Property changes on: chrome/browser/ui/panels/panel_browsertest.cc
___________________________________________________________________
Added: svn:mergeinfo