Revert 269892 "linux_aura: Compile ash into chrome."

trunk/src/chrome/browser/extensions/window_open_apitest.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 "base/command_line.h"
 #include "base/memory/scoped_vector.h"
 #include "base/path_service.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
@@ skipping 17 matching lines @@
 #include "extensions/common/extension.h"
 #include "extensions/common/switches.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(USE_ASH)
 #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
 
 using content::OpenURLParams;
 using content::Referrer;
 using content::WebContents;
 
 // Disabled, http://crbug.com/64899.
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_WindowOpen) {
@@ skipping 217 matching lines @@
 // We're also failing on Linux-aura due to the panel is not opened in the
 // right origin.
 #define MAYBE_WindowOpenPanelDetached DISABLED_WindowOpenPanelDetached
 #else
 #define MAYBE_WindowOpenPanelDetached WindowOpenPanelDetached
 #endif
 IN_PROC_BROWSER_TEST_F(WindowOpenPanelTest, MAYBE_WindowOpenPanelDetached) {
   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))
     return;
 #endif
 
 #if defined(USE_ASH_PANELS)
   // On Ash, new panel windows open as popup windows instead.
   int num_popups, num_panels;
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnablePanels)) {
@@ skipping 50 matching lines @@
 #endif
 #if defined(USE_ASH)
 #if !defined(OS_WIN)
   // On linux ash we close all popup applications when closing its extension.
   num_popups = 0;
 #endif
 #endif
   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)
   // On Ash, new panel windows open as popup windows instead.
   int num_popups = 4;
   int num_panels = 0;
 #else
   int num_popups = 2;
   int num_panels = 2;
 #endif
@@ skipping 128 matching lines @@
       OpenWindow(browser()->tab_strip_model()->GetActiveWebContents(),
       GURL(std::string("chrome-extension://") + last_loaded_extension_id() +
           "/newtab.html"), false, &newtab));
 
   // Extension API should succeed.
   bool result = false;
   ASSERT_TRUE(content::ExecuteScriptAndExtractBool(newtab, "testExtensionApi()",
                                                    &result));
   EXPECT_TRUE(result);
 }