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 941 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
952 | 952 |
953 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestDisplayNoneWebviewLoad) { | 953 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestDisplayNoneWebviewLoad) { |
954 TestHelper("testDisplayNoneWebviewLoad", "web_view/shim", NO_TEST_SERVER); | 954 TestHelper("testDisplayNoneWebviewLoad", "web_view/shim", NO_TEST_SERVER); |
955 } | 955 } |
956 | 956 |
957 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestDisplayNoneWebviewRemoveChild) { | 957 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestDisplayNoneWebviewRemoveChild) { |
958 TestHelper("testDisplayNoneWebviewRemoveChild", | 958 TestHelper("testDisplayNoneWebviewRemoveChild", |
959 "web_view/shim", NO_TEST_SERVER); | 959 "web_view/shim", NO_TEST_SERVER); |
960 } | 960 } |
961 | 961 |
| 962 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestDisplayBlock) { |
| 963 TestHelper("testDisplayBlock", "web_view/shim", NO_TEST_SERVER); |
| 964 } |
| 965 |
962 IN_PROC_BROWSER_TEST_F(WebViewTest, | 966 IN_PROC_BROWSER_TEST_F(WebViewTest, |
963 Shim_TestInlineScriptFromAccessibleResources) { | 967 Shim_TestInlineScriptFromAccessibleResources) { |
964 TestHelper("testInlineScriptFromAccessibleResources", | 968 TestHelper("testInlineScriptFromAccessibleResources", |
965 "web_view/shim", | 969 "web_view/shim", |
966 NO_TEST_SERVER); | 970 NO_TEST_SERVER); |
967 } | 971 } |
968 | 972 |
969 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestInvalidChromeExtensionURL) { | 973 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestInvalidChromeExtensionURL) { |
970 TestHelper("testInvalidChromeExtensionURL", "web_view/shim", NO_TEST_SERVER); | 974 TestHelper("testInvalidChromeExtensionURL", "web_view/shim", NO_TEST_SERVER); |
971 } | 975 } |
(...skipping 1621 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2593 // http://crbug.com/403325 | 2597 // http://crbug.com/403325 |
2594 #define MAYBE_WebViewInBackgroundPage \ | 2598 #define MAYBE_WebViewInBackgroundPage \ |
2595 DISABLED_WebViewInBackgroundPage | 2599 DISABLED_WebViewInBackgroundPage |
2596 #else | 2600 #else |
2597 #define MAYBE_WebViewInBackgroundPage WebViewInBackgroundPage | 2601 #define MAYBE_WebViewInBackgroundPage WebViewInBackgroundPage |
2598 #endif | 2602 #endif |
2599 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_WebViewInBackgroundPage) { | 2603 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_WebViewInBackgroundPage) { |
2600 ASSERT_TRUE(RunExtensionTest("platform_apps/web_view/background")) | 2604 ASSERT_TRUE(RunExtensionTest("platform_apps/web_view/background")) |
2601 << message_; | 2605 << message_; |
2602 } | 2606 } |
OLD | NEW |