| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/memory/scoped_vector.h" | 6 #include "base/memory/scoped_vector.h" |
| 7 #include "base/stringprintf.h" | 7 #include "base/stringprintf.h" |
| 8 #include "chrome/browser/extensions/extension_apitest.h" | 8 #include "chrome/browser/extensions/extension_apitest.h" |
| 9 #include "chrome/browser/extensions/extension_test_message_listener.h" | 9 #include "chrome/browser/extensions/extension_test_message_listener.h" |
| 10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
| 11 #include "chrome/browser/ui/browser_list.h" | 11 #include "chrome/browser/ui/browser_list.h" |
| (...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 238 for (size_t i = 0; i < listeners.size(); ++i) | 238 for (size_t i = 0; i < listeners.size(); ++i) |
| 239 ASSERT_TRUE(listeners[i]->WaitUntilSatisfied()); | 239 ASSERT_TRUE(listeners[i]->WaitUntilSatisfied()); |
| 240 | 240 |
| 241 UninstallExtension(extension->id()); | 241 UninstallExtension(extension->id()); |
| 242 | 242 |
| 243 // Wait for one tab and one popup in non-extension domain to stay open. | 243 // Wait for one tab and one popup in non-extension domain to stay open. |
| 244 // Expect everything else, including panels, to close. | 244 // Expect everything else, including panels, to close. |
| 245 WaitForTabsAndPopups(browser(), 1, 1, 0); | 245 WaitForTabsAndPopups(browser(), 1, 1, 0); |
| 246 } | 246 } |
| 247 | 247 |
| 248 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_WindowOpener) { | 248 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WindowOpener) { |
| 249 ASSERT_TRUE(RunExtensionTest("window_open/opener")) << message_; | 249 ASSERT_TRUE(RunExtensionTest("window_open/opener")) << message_; |
| 250 } | 250 } |
| OLD | NEW |