| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "apps/shell_window.h" | 5 #include "apps/shell_window.h" |
| 6 #include "apps/shell_window_registry.h" | 6 #include "apps/shell_window_registry.h" |
| 7 #include "base/strings/stringprintf.h" | 7 #include "base/strings/stringprintf.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "chrome/browser/apps/app_browsertest_util.h" | 9 #include "chrome/browser/apps/app_browsertest_util.h" |
| 10 #include "chrome/browser/extensions/extension_test_message_listener.h" | 10 #include "chrome/browser/extensions/extension_test_message_listener.h" |
| (...skipping 580 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 591 "web_view/newwindow", | 591 "web_view/newwindow", |
| 592 NEEDS_TEST_SERVER); | 592 NEEDS_TEST_SERVER); |
| 593 } | 593 } |
| 594 | 594 |
| 595 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, NewWindow_ExecuteScript) { | 595 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, NewWindow_ExecuteScript) { |
| 596 TestHelper("testNewWindowExecuteScript", | 596 TestHelper("testNewWindowExecuteScript", |
| 597 "web_view/newwindow", | 597 "web_view/newwindow", |
| 598 NEEDS_TEST_SERVER); | 598 NEEDS_TEST_SERVER); |
| 599 } | 599 } |
| 600 | 600 |
| 601 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, |
| 602 NewWindow_DeclarativeWebRequest) { |
| 603 TestHelper("testNewWindowDeclarativeWebRequest", |
| 604 "web_view/newwindow", |
| 605 NEEDS_TEST_SERVER); |
| 606 } |
| 607 |
| 601 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, NewWindow_WebRequest) { | 608 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, NewWindow_WebRequest) { |
| 602 TestHelper("testNewWindowWebRequest", | 609 TestHelper("testNewWindowWebRequest", |
| 603 "web_view/newwindow", | 610 "web_view/newwindow", |
| 604 NEEDS_TEST_SERVER); | 611 NEEDS_TEST_SERVER); |
| 605 } | 612 } |
| 606 | 613 |
| 607 // A custom elements bug needs to be addressed to enable this test: | 614 // A custom elements bug needs to be addressed to enable this test: |
| 608 // See http://crbug.com/282477 for more information. | 615 // See http://crbug.com/282477 for more information. |
| 609 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, | 616 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, |
| 610 DISABLED_NewWindow_WebRequestCloseWindow) { | 617 DISABLED_NewWindow_WebRequestCloseWindow) { |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 767 | 774 |
| 768 ASSERT_TRUE(done_listener.WaitUntilSatisfied()); | 775 ASSERT_TRUE(done_listener.WaitUntilSatisfied()); |
| 769 } | 776 } |
| 770 | 777 |
| 771 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, | 778 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, |
| 772 PointerLock_PointerLockLostWithFocus) { | 779 PointerLock_PointerLockLostWithFocus) { |
| 773 TestHelper("testPointerLockLostWithFocus", | 780 TestHelper("testPointerLockLostWithFocus", |
| 774 "web_view/pointerlock", | 781 "web_view/pointerlock", |
| 775 NO_TEST_SERVER); | 782 NO_TEST_SERVER); |
| 776 } | 783 } |
| OLD | NEW |