[Panel refactor] use browserless Panels by default in Dev/Canary

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"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
+#include "chrome/browser/ui/panels/panel_manager.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "net/base/mock_host_resolver.h"
 
 using content::OpenURLParams;
 using content::Referrer;
@@ skipping 12 matching lines @@
 
 void WaitForTabsAndPopups(Browser* browser,
                           int num_tabs,
                           int num_popups,
                           int num_panels) {
   SCOPED_TRACE(
       StringPrintf("WaitForTabsAndPopups tabs:%d, popups:%d, panels:%d",
                    num_tabs, num_popups, num_panels));
   // We start with one tab and one browser already open.
   ++num_tabs;
-  size_t num_browsers = static_cast<size_t>(num_popups + num_panels) + 1;
+  size_t num_browsers = static_cast<size_t>(num_popups) + 1;
 
   const base::TimeDelta kWaitTime = base::TimeDelta::FromSeconds(15);
   base::TimeTicks end_time = base::TimeTicks::Now() + kWaitTime;
   while (base::TimeTicks::Now() < end_time) {
     if (browser::GetBrowserCount(browser->profile()) == num_browsers &&
-        browser->tab_count() == num_tabs)
+        browser->tab_count() == num_tabs &&
+        PanelManager::GetInstance()->num_panels() == num_panels)
       break;
 
     content::RunAllPendingInMessageLoop();
   }
 
   EXPECT_EQ(num_browsers, browser::GetBrowserCount(browser->profile()));
   EXPECT_EQ(num_tabs, browser->tab_count());
+  EXPECT_EQ(num_panels, PanelManager::GetInstance()->num_panels());
 
   int num_popups_seen = 0;
-  int num_panels_seen = 0;
   for (BrowserList::const_iterator iter = BrowserList::begin();
        iter != BrowserList::end(); ++iter) {
     if (*iter == browser)
       continue;
 
-    // Check for TYPE_POPUP or TYPE_PANEL.
-    EXPECT_TRUE((*iter)->is_type_popup() || (*iter)->is_type_panel());
-    if ((*iter)->is_type_popup())
-      ++num_popups_seen;
-    else
-      ++num_panels_seen;
+    // Check for TYPE_POPUP.
+    EXPECT_TRUE((*iter)->is_type_popup());
+    ++num_popups_seen;
   }
   EXPECT_EQ(num_popups, num_popups_seen);
-  EXPECT_EQ(num_panels, num_panels_seen);
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, BrowserIsApp) {
   host_resolver()->AddRule("a.com", "127.0.0.1");
   ASSERT_TRUE(StartTestServer());
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("window_open").AppendASCII("browser_is_app")));
 
   WaitForTabsAndPopups(browser(), 0, 2, 0);
 
@@ skipping 110 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(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)
   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.
@@ skipping 88 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);
 }