[Panel refactor] Deprecate old 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 190 matching lines @@
 };
 
 #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) {
-  if (!PanelManager::UseBrowserlessPanels())
-    return;
   ASSERT_TRUE(RunExtensionTest("window_open/panel")) << message_;
 }
 
 #if defined(USE_ASH)
 // On Ash, this currently fails because we're currently opening new panel
 // windows as popup windows instead.
 #define MAYBE_WindowOpenPanelDetached FAILS_WindowOpenPanelDetached
 #else
 #define MAYBE_WindowOpenPanelDetached WindowOpenPanelDetached
 #endif
 IN_PROC_BROWSER_TEST_F(WindowOpenPanelTest, MAYBE_WindowOpenPanelDetached) {
-  if (!PanelManager::UseBrowserlessPanels())
-    return;
   ASSERT_TRUE(RunExtensionTest("window_open/panel_detached")) << 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) {
-  if (!PanelManager::UseBrowserlessPanels())
-    return;
   ASSERT_TRUE(RunExtensionTest("window_open/focus")) << message_;
 }
 #endif
 
 IN_PROC_BROWSER_TEST_F(WindowOpenPanelTest,
                        CloseNonExtensionPanelsOnUninstall) {
-  if (!PanelManager::UseBrowserlessPanels())
-    return;
 #if defined(USE_ASH)
   // 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
   ASSERT_TRUE(StartTestServer());
 
@@ skipping 19 matching lines @@
   // 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, 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.
+  // Wait for the tabs and popups in non-extension domain to stay open.
   // Expect everything else, including panels, to close.
-  num_popups = 1;
+#if defined(USE_ASH)
+  // On Ash, new panel windows open as popup windows instead, so there are 2
+  // extension domain popups that will close (instead of 1 popup on non-Ash).
+  num_popups -= 2;
+#else
+  num_popups -= 1;
+#endif
   WaitForTabsAndPopups(browser(), 1, num_popups, 0);
 }
 
 #if defined(USE_ASH)
 // This test is not applicable on Ash. Ash opens panel windows as popup
 // windows. The modified window.open behavior only applies to panel windows.
 #define MAYBE_WindowOpenFromPanel DISABLED_WindowOpenFromPanel
 #else
 #define MAYBE_WindowOpenFromPanel WindowOpenFromPanel
 #endif
 IN_PROC_BROWSER_TEST_F(WindowOpenPanelTest, MAYBE_WindowOpenFromPanel) {
-  if (!PanelManager::UseBrowserlessPanels())
-    return;
-
   ASSERT_TRUE(StartTestServer());
 
   // Load the extension that will open a panel which then calls window.open.
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("window_open").
                             AppendASCII("panel_window_open")));
 
   // Expect one panel (opened by extension) and one tab (from the panel calling
   // window.open). Panels modify the WindowOpenDisposition in window.open
   // to always open in a tab.
   WaitForTabsAndPopups(browser(), 1, 0, 1);
@@ skipping 51 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(content::ExecuteJavaScriptAndExtractBool(
       newtab->GetRenderViewHost(), L"", L"testExtensionApi()", &result));
   EXPECT_TRUE(result);
 }