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/browser/apps/app_browsertest_util.h" | 8 #include "chrome/browser/apps/app_browsertest_util.h" |
9 #include "chrome/browser/chrome_content_browser_client.h" | 9 #include "chrome/browser/chrome_content_browser_client.h" |
10 #include "chrome/browser/extensions/extension_test_message_listener.h" | 10 #include "chrome/browser/extensions/extension_test_message_listener.h" |
(...skipping 1169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1180 | 1180 |
1181 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestLoadAbortInvalidNavigation) { | 1181 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestLoadAbortInvalidNavigation) { |
1182 TestHelper("testLoadAbortInvalidNavigation", "web_view/shim", NO_TEST_SERVER); | 1182 TestHelper("testLoadAbortInvalidNavigation", "web_view/shim", NO_TEST_SERVER); |
1183 } | 1183 } |
1184 | 1184 |
1185 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestLoadAbortNonWebSafeScheme) { | 1185 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestLoadAbortNonWebSafeScheme) { |
1186 TestHelper("testLoadAbortNonWebSafeScheme", "web_view/shim", NO_TEST_SERVER); | 1186 TestHelper("testLoadAbortNonWebSafeScheme", "web_view/shim", NO_TEST_SERVER); |
1187 } | 1187 } |
1188 | 1188 |
1189 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestReload) { | 1189 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestReload) { |
1190 TestHelper("testReload", "web_view/shim", NEEDS_TEST_SERVER); | 1190 TestHelper("testReload", "web_view/shim", NO_TEST_SERVER); |
| 1191 } |
| 1192 |
| 1193 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestReloadAfterTerminate) { |
| 1194 TestHelper("testReloadAfterTerminate", "web_view/shim", NO_TEST_SERVER); |
1191 } | 1195 } |
1192 | 1196 |
1193 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestGetProcessId) { | 1197 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestGetProcessId) { |
1194 TestHelper("testGetProcessId", "web_view/shim", NEEDS_TEST_SERVER); | 1198 TestHelper("testGetProcessId", "web_view/shim", NEEDS_TEST_SERVER); |
1195 } | 1199 } |
1196 | 1200 |
1197 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestHiddenBeforeNavigation) { | 1201 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestHiddenBeforeNavigation) { |
1198 TestHelper("testHiddenBeforeNavigation", "web_view/shim", NO_TEST_SERVER); | 1202 TestHelper("testHiddenBeforeNavigation", "web_view/shim", NO_TEST_SERVER); |
1199 } | 1203 } |
1200 | 1204 |
(...skipping 1133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2334 // http://crbug.com/403325 | 2338 // http://crbug.com/403325 |
2335 #define MAYBE_WebViewInBackgroundPage \ | 2339 #define MAYBE_WebViewInBackgroundPage \ |
2336 DISABLED_WebViewInBackgroundPage | 2340 DISABLED_WebViewInBackgroundPage |
2337 #else | 2341 #else |
2338 #define MAYBE_WebViewInBackgroundPage WebViewInBackgroundPage | 2342 #define MAYBE_WebViewInBackgroundPage WebViewInBackgroundPage |
2339 #endif | 2343 #endif |
2340 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_WebViewInBackgroundPage) { | 2344 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_WebViewInBackgroundPage) { |
2341 ASSERT_TRUE(RunExtensionTest("platform_apps/web_view/background")) | 2345 ASSERT_TRUE(RunExtensionTest("platform_apps/web_view/background")) |
2342 << message_; | 2346 << message_; |
2343 } | 2347 } |
OLD | NEW |