Deprecate --aura-panels

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/stringprintf.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 177 matching lines @@
   ASSERT_TRUE(RunExtensionTest("window_open/panel_not_enabled")) << message_;
 }
 
 class WindowOpenPanelTest : public ExtensionApiTest {
   virtual void SetUpCommandLine(CommandLine* command_line) {
     ExtensionApiTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(switches::kEnablePanels);
   }
 };
 
-#if defined(USE_AURA)
-// On Aura, this currently fails because we're currently opening new panel
+#if defined(USE_ASH)
+// On Ash, this currently fails because we're currently opening new panel
 // windows as popup windows instead.
 #define MAYBE_WindowOpenPanel FAILS_WindowOpenPanel
 #else
 #define MAYBE_WindowOpenPanel WindowOpenPanel
 #endif
 IN_PROC_BROWSER_TEST_F(WindowOpenPanelTest, MAYBE_WindowOpenPanel) {
   ASSERT_TRUE(RunExtensionTest("window_open/panel")) << message_;
 }
 
 #if defined(OS_MACOSX) || defined(OS_WIN)
 // Focus test fails if there is no window manager on Linux.
 IN_PROC_BROWSER_TEST_F(WindowOpenPanelTest, WindowOpenFocus) {
   ASSERT_TRUE(RunExtensionTest("window_open/focus")) << message_;
 }
 #endif
 
 IN_PROC_BROWSER_TEST_F(WindowOpenPanelTest,
                        CloseNonExtensionPanelsOnUninstall) {
+#if defined(USE_ASH)
+  int num_popups = 4;
+  int num_panels = 0;
+#else
+  int num_popups = 2;
+  int num_panels = 2;
+#endif
   ASSERT_TRUE(StartTestServer());
 
   // Setup listeners to wait on strings we expect the extension pages to send.
   std::vector<std::string> test_strings;
   test_strings.push_back("content_tab");
-  test_strings.push_back("content_panel");
+  if (num_panels)
+    test_strings.push_back("content_panel");
   test_strings.push_back("content_popup");
 
   ScopedVector<ExtensionTestMessageListener> listeners;
   for (size_t i = 0; i < test_strings.size(); ++i) {
     listeners.push_back(
         new ExtensionTestMessageListener(test_strings[i], false));
   }
 
   const extensions::Extension* extension = LoadExtension(
       test_data_dir_.AppendASCII("window_open").AppendASCII(
           "close_panels_on_uninstall"));
   ASSERT_TRUE(extension);
 
   // Two tabs. One in extension domain and one in non-extension domain.
   // Two popups - one in extension domain and one in non-extension domain.
   // Two panels - one in extension domain and one in non-extension domain.
-  WaitForTabsAndPopups(browser(), 2, 2, 2);
+  WaitForTabsAndPopups(browser(), 2, num_popups, num_panels);
 
   // Wait on test messages to make sure the pages loaded.
   for (size_t i = 0; i < listeners.size(); ++i)
     ASSERT_TRUE(listeners[i]->WaitUntilSatisfied());
 
   UninstallExtension(extension->id());
 
   // Wait for one tab and one popup in non-extension domain to stay open.
   // Expect everything else, including panels, to close.
-  WaitForTabsAndPopups(browser(), 1, 1, 0);
+#if defined(USE_ASH)
+  // In Ash and additional popup remains for the "panel" non-extension domain.
+  num_popups = 2;
+#else
+  num_popups = 1;
+#endif
+  WaitForTabsAndPopups(browser(), 1, num_popups, 0);
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_WindowOpener) {
   ASSERT_TRUE(RunExtensionTest("window_open/opener")) << message_;
 }
 
 // Tests that an extension page can call window.open to an extension URL and
 // the new window has extension privileges.
 IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, WindowOpenExtension) {
   ASSERT_TRUE(LoadExtension(
@@ skipping 41 matching lines @@
   ASSERT_NO_FATAL_FAILURE(OpenWindow(chrome::GetActiveWebContents(browser()),
       GURL(std::string("chrome-extension://") + last_loaded_extension_id_ +
           "/newtab.html"), false, &newtab));
 
   // Extension API should succeed.
   bool result = false;
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
       newtab->GetRenderViewHost(), L"", L"testExtensionApi()", &result));
   EXPECT_TRUE(result);
 }