Revert 269892 "linux_aura: Compile ash into chrome."

trunk/src/chrome/browser/extensions/window_open_apitest.cc

Index: trunk/src/chrome/browser/extensions/window_open_apitest.cc
===================================================================
--- trunk/src/chrome/browser/extensions/window_open_apitest.cc	(revision 269901)
+++ trunk/src/chrome/browser/extensions/window_open_apitest.cc	(working copy)
@@ -35,7 +35,7 @@
 #include "apps/app_window_registry.h"
 #endif
 
-#if defined(USE_ASH) && defined(OS_CHROMEOS)
+#if defined(USE_ASH) && !defined(OS_WIN)
 // TODO(stevenjb): Figure out the correct behavior for Ash + Win
 #define USE_ASH_PANELS
 #endif
@@ -273,16 +273,8 @@
   ASSERT_TRUE(RunExtensionTest("window_open/panel_detached")) << message_;
 }
 
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-// TODO(erg): Bring up ash http://crbug.com/300084
-#define MAYBE_CloseNonExtensionPanelsOnUninstall \
-  DISABLED_CloseNonExtensionPanelsOnUninstall
-#else
-#define MAYBE_CloseNonExtensionPanelsOnUninstall \
-  CloseNonExtensionPanelsOnUninstall
-#endif
 IN_PROC_BROWSER_TEST_F(WindowOpenPanelTest,
-                       MAYBE_CloseNonExtensionPanelsOnUninstall) {
+                       CloseNonExtensionPanelsOnUninstall) {
 #if defined(OS_WIN) && defined(USE_ASH)
   // Disable this test in Metro+Ash for now (http://crbug.com/262796).
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
@@ -353,8 +345,8 @@
   EXPECT_TRUE(WaitForTabsAndPopups(browser(), 1, num_popups, 0));
 }
 
-// This test isn't applicable on Chrome OS, which automatically reloads crashed
-// pages.
+// This test isn't applicable on Chrome OS, which automatically reloads
+// crashed pages.
 #if !defined(OS_CHROMEOS)
 IN_PROC_BROWSER_TEST_F(WindowOpenPanelTest, ClosePanelsOnExtensionCrash) {
 #if defined(USE_ASH_PANELS)