| 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/ui/native_app_window.h" | 5 #include "apps/ui/native_app_window.h" |
| 6 #include "base/path_service.h" | 6 #include "base/path_service.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/app/chrome_command_ids.h" | 9 #include "chrome/app/chrome_command_ids.h" |
| 10 #include "chrome/browser/apps/app_browsertest_util.h" | 10 #include "chrome/browser/apps/app_browsertest_util.h" |
| (...skipping 785 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 796 return; | 796 return; |
| 797 #endif | 797 #endif |
| 798 | 798 |
| 799 TestHelper("testExecuteScriptFail", "web_view/shim", NEEDS_TEST_SERVER); | 799 TestHelper("testExecuteScriptFail", "web_view/shim", NEEDS_TEST_SERVER); |
| 800 } | 800 } |
| 801 | 801 |
| 802 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestExecuteScript) { | 802 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestExecuteScript) { |
| 803 TestHelper("testExecuteScript", "web_view/shim", NO_TEST_SERVER); | 803 TestHelper("testExecuteScript", "web_view/shim", NO_TEST_SERVER); |
| 804 } | 804 } |
| 805 | 805 |
| 806 IN_PROC_BROWSER_TEST_F( |
| 807 WebViewTest, |
| 808 Shim_TestExecuteScriptIsAbortedWhenWebViewSourceIsChanged) { |
| 809 TestHelper("testExecuteScriptIsAbortedWhenWebViewSourceIsChanged", |
| 810 "web_view/shim", |
| 811 NO_TEST_SERVER); |
| 812 } |
| 813 |
| 806 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestTerminateAfterExit) { | 814 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestTerminateAfterExit) { |
| 807 TestHelper("testTerminateAfterExit", "web_view/shim", NO_TEST_SERVER); | 815 TestHelper("testTerminateAfterExit", "web_view/shim", NO_TEST_SERVER); |
| 808 } | 816 } |
| 809 | 817 |
| 810 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestAssignSrcAfterCrash) { | 818 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestAssignSrcAfterCrash) { |
| 811 TestHelper("testAssignSrcAfterCrash", "web_view/shim", NO_TEST_SERVER); | 819 TestHelper("testAssignSrcAfterCrash", "web_view/shim", NO_TEST_SERVER); |
| 812 } | 820 } |
| 813 | 821 |
| 814 IN_PROC_BROWSER_TEST_F(WebViewTest, | 822 IN_PROC_BROWSER_TEST_F(WebViewTest, |
| 815 Shim_TestNavOnConsecutiveSrcAttributeChanges) { | 823 Shim_TestNavOnConsecutiveSrcAttributeChanges) { |
| (...skipping 1222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2038 INSTANTIATE_TEST_CASE_P(WithoutThreadedCompositor, | 2046 INSTANTIATE_TEST_CASE_P(WithoutThreadedCompositor, |
| 2039 WebViewCaptureTest, | 2047 WebViewCaptureTest, |
| 2040 ::testing::Values(std::string(switches::kDisableThreadedCompositing))); | 2048 ::testing::Values(std::string(switches::kDisableThreadedCompositing))); |
| 2041 #endif | 2049 #endif |
| 2042 | 2050 |
| 2043 #if defined(USE_AURA) || defined(OS_MACOSX) | 2051 #if defined(USE_AURA) || defined(OS_MACOSX) |
| 2044 INSTANTIATE_TEST_CASE_P(WithThreadedCompositor, | 2052 INSTANTIATE_TEST_CASE_P(WithThreadedCompositor, |
| 2045 WebViewCaptureTest, | 2053 WebViewCaptureTest, |
| 2046 ::testing::Values(std::string(switches::kEnableThreadedCompositing))); | 2054 ::testing::Values(std::string(switches::kEnableThreadedCompositing))); |
| 2047 #endif | 2055 #endif |
| OLD | NEW |