Restore panel behavior on Ash/ChromeOS

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 202 matching lines @@
   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.
   std::vector<std::string> test_strings;
   test_strings.push_back("content_tab");
   if (num_panels)
     test_strings.push_back("content_panel");
   test_strings.push_back("content_popup");
 
   ScopedVector<ExtensionTestMessageListener> listeners;
@@ skipping 13 matching lines @@
   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.
-#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) {
@@ skipping 42 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);
 }