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 "base/path_service.h" | 5 #include "base/path_service.h" |
6 #include "base/strings/stringprintf.h" | 6 #include "base/strings/stringprintf.h" |
7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
8 #include "chrome/app/chrome_command_ids.h" | 8 #include "chrome/app/chrome_command_ids.h" |
9 #include "chrome/browser/apps/app_browsertest_util.h" | 9 #include "chrome/browser/apps/app_browsertest_util.h" |
10 #include "chrome/browser/chrome_content_browser_client.h" | 10 #include "chrome/browser/chrome_content_browser_client.h" |
(...skipping 1068 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1079 NO_TEST_SERVER); | 1079 NO_TEST_SERVER); |
1080 } | 1080 } |
1081 | 1081 |
1082 IN_PROC_BROWSER_TEST_F(WebViewTest, | 1082 IN_PROC_BROWSER_TEST_F(WebViewTest, |
1083 Shim_TestPartitionRemovalAfterNavigationFails) { | 1083 Shim_TestPartitionRemovalAfterNavigationFails) { |
1084 TestHelper("testPartitionRemovalAfterNavigationFails", | 1084 TestHelper("testPartitionRemovalAfterNavigationFails", |
1085 "web_view/shim", | 1085 "web_view/shim", |
1086 NO_TEST_SERVER); | 1086 NO_TEST_SERVER); |
1087 } | 1087 } |
1088 | 1088 |
| 1089 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestAddContentScript) { |
| 1090 TestHelper("testAddContentScript", "web_view/shim", NEEDS_TEST_SERVER); |
| 1091 } |
| 1092 |
| 1093 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestAddMultiContentScripts) { |
| 1094 TestHelper("testAddMultiContentScripts", "web_view/shim", NEEDS_TEST_SERVER); |
| 1095 } |
| 1096 |
| 1097 IN_PROC_BROWSER_TEST_F( |
| 1098 WebViewTest, |
| 1099 Shim_TestAddContentScriptToOneWebViewShouldNotInjectToTheOtherWebView) { |
| 1100 TestHelper("testAddContentScriptToOneWebViewShouldNotInjectToTheOtherWebView", |
| 1101 "web_view/shim", NEEDS_TEST_SERVER); |
| 1102 } |
| 1103 |
| 1104 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestAddAndRemoveContentScripts) { |
| 1105 TestHelper("testAddAndRemoveContentScripts", "web_view/shim", |
| 1106 NEEDS_TEST_SERVER); |
| 1107 } |
| 1108 |
1089 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestExecuteScriptFail) { | 1109 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestExecuteScriptFail) { |
1090 #if defined(OS_WIN) | 1110 #if defined(OS_WIN) |
1091 // Flaky on XP bot http://crbug.com/266185 | 1111 // Flaky on XP bot http://crbug.com/266185 |
1092 if (base::win::GetVersion() <= base::win::VERSION_XP) | 1112 if (base::win::GetVersion() <= base::win::VERSION_XP) |
1093 return; | 1113 return; |
1094 #endif | 1114 #endif |
1095 | 1115 |
1096 TestHelper("testExecuteScriptFail", "web_view/shim", NEEDS_TEST_SERVER); | 1116 TestHelper("testExecuteScriptFail", "web_view/shim", NEEDS_TEST_SERVER); |
1097 } | 1117 } |
1098 | 1118 |
(...skipping 1618 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2717 // http://crbug.com/403325 | 2737 // http://crbug.com/403325 |
2718 #define MAYBE_WebViewInBackgroundPage \ | 2738 #define MAYBE_WebViewInBackgroundPage \ |
2719 DISABLED_WebViewInBackgroundPage | 2739 DISABLED_WebViewInBackgroundPage |
2720 #else | 2740 #else |
2721 #define MAYBE_WebViewInBackgroundPage WebViewInBackgroundPage | 2741 #define MAYBE_WebViewInBackgroundPage WebViewInBackgroundPage |
2722 #endif | 2742 #endif |
2723 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_WebViewInBackgroundPage) { | 2743 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_WebViewInBackgroundPage) { |
2724 ASSERT_TRUE(RunExtensionTest("platform_apps/web_view/background")) | 2744 ASSERT_TRUE(RunExtensionTest("platform_apps/web_view/background")) |
2725 << message_; | 2745 << message_; |
2726 } | 2746 } |
OLD | NEW |