| 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 569 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 580 "web_view/newwindow", | 580 "web_view/newwindow", |
| 581 NEEDS_TEST_SERVER); | 581 NEEDS_TEST_SERVER); |
| 582 } | 582 } |
| 583 | 583 |
| 584 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, NewWindow_ExecuteScript) { | 584 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, NewWindow_ExecuteScript) { |
| 585 TestHelper("testNewWindowExecuteScript", | 585 TestHelper("testNewWindowExecuteScript", |
| 586 "web_view/newwindow", | 586 "web_view/newwindow", |
| 587 NEEDS_TEST_SERVER); | 587 NEEDS_TEST_SERVER); |
| 588 } | 588 } |
| 589 | 589 |
| 590 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, |
| 591 NewWindow_DeclarativeWebRequest) { |
| 592 TestHelper("testNewWindowDeclarativeWebRequest", |
| 593 "web_view/newwindow", |
| 594 NEEDS_TEST_SERVER); |
| 595 } |
| 596 |
| 590 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, NewWindow_WebRequest) { | 597 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, NewWindow_WebRequest) { |
| 591 TestHelper("testNewWindowWebRequest", | 598 TestHelper("testNewWindowWebRequest", |
| 592 "web_view/newwindow", | 599 "web_view/newwindow", |
| 593 NEEDS_TEST_SERVER); | 600 NEEDS_TEST_SERVER); |
| 594 } | 601 } |
| 595 | 602 |
| 596 // A custom elements bug needs to be addressed to enable this test: | 603 // A custom elements bug needs to be addressed to enable this test: |
| 597 // See http://crbug.com/282477 for more information. | 604 // See http://crbug.com/282477 for more information. |
| 598 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, | 605 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, |
| 599 DISABLED_NewWindow_WebRequestCloseWindow) { | 606 DISABLED_NewWindow_WebRequestCloseWindow) { |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 756 | 763 |
| 757 ASSERT_TRUE(done_listener.WaitUntilSatisfied()); | 764 ASSERT_TRUE(done_listener.WaitUntilSatisfied()); |
| 758 } | 765 } |
| 759 | 766 |
| 760 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, | 767 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, |
| 761 PointerLock_PointerLockLostWithFocus) { | 768 PointerLock_PointerLockLostWithFocus) { |
| 762 TestHelper("testPointerLockLostWithFocus", | 769 TestHelper("testPointerLockLostWithFocus", |
| 763 "web_view/pointerlock", | 770 "web_view/pointerlock", |
| 764 NO_TEST_SERVER); | 771 NO_TEST_SERVER); |
| 765 } | 772 } |
| OLD | NEW |