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 2440 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2451 } | 2451 } |
2452 | 2452 |
2453 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestFindAPI_findupdate) { | 2453 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestFindAPI_findupdate) { |
2454 TestHelper("testFindAPI_findupdate", "web_view/shim", NO_TEST_SERVER); | 2454 TestHelper("testFindAPI_findupdate", "web_view/shim", NO_TEST_SERVER); |
2455 } | 2455 } |
2456 | 2456 |
2457 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestLoadDataAPI) { | 2457 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestLoadDataAPI) { |
2458 TestHelper("testLoadDataAPI", "web_view/shim", NEEDS_TEST_SERVER); | 2458 TestHelper("testLoadDataAPI", "web_view/shim", NEEDS_TEST_SERVER); |
2459 } | 2459 } |
2460 | 2460 |
2461 // This test verifies that the resize and contentResize events work correctly. | |
2462 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestResizeEvents) { | |
2463 TestHelper("testResizeEvents", "web_view/shim", NO_TEST_SERVER); | |
2464 } | |
2465 | |
2461 // This test verify that the set of rules registries of a webview will be | 2466 // This test verify that the set of rules registries of a webview will be |
2462 // removed from RulesRegistryService after the webview is gone. | 2467 // removed from RulesRegistryService after the webview is gone. |
2463 // http://crbug.com/438327 | 2468 // http://crbug.com/438327 |
2464 IN_PROC_BROWSER_TEST_F( | 2469 IN_PROC_BROWSER_TEST_F( |
2465 WebViewTest, | 2470 WebViewTest, |
2466 DISABLED_Shim_TestRulesRegistryIDAreRemovedAfterWebViewIsGone) { | 2471 DISABLED_Shim_TestRulesRegistryIDAreRemovedAfterWebViewIsGone) { |
2467 LoadAppWithGuest("web_view/rules_registry"); | 2472 LoadAppWithGuest("web_view/rules_registry"); |
2468 | 2473 |
2469 content::WebContents* embedder_web_contents = GetEmbedderWebContents(); | 2474 content::WebContents* embedder_web_contents = GetEmbedderWebContents(); |
2470 ASSERT_TRUE(embedder_web_contents); | 2475 ASSERT_TRUE(embedder_web_contents); |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2536 LoadAppWithGuest("web_view/inside_iframe"); | 2541 LoadAppWithGuest("web_view/inside_iframe"); |
2537 } | 2542 } |
2538 | 2543 |
2539 // <webview> screenshot capture fails with ubercomp. | 2544 // <webview> screenshot capture fails with ubercomp. |
2540 // See http://crbug.com/327035. | 2545 // See http://crbug.com/327035. |
2541 IN_PROC_BROWSER_TEST_F(WebViewCaptureTest, | 2546 IN_PROC_BROWSER_TEST_F(WebViewCaptureTest, |
2542 DISABLED_Shim_ScreenshotCapture) { | 2547 DISABLED_Shim_ScreenshotCapture) { |
2543 TestHelper("testScreenshotCapture", "web_view/shim", NO_TEST_SERVER); | 2548 TestHelper("testScreenshotCapture", "web_view/shim", NO_TEST_SERVER); |
2544 } | 2549 } |
2545 | 2550 |
2551 | |
Fady Samuel
2015/03/05 21:15:34
Remove these extra lines.
paulmeyer
2015/03/06 18:31:02
Done.
| |
2552 | |
2546 #if defined(OS_WIN) | 2553 #if defined(OS_WIN) |
2547 // Test is disabled on Windows because it times out often. | 2554 // Test is disabled on Windows because it times out often. |
2548 // http://crbug.com/403325 | 2555 // http://crbug.com/403325 |
2549 #define MAYBE_WebViewInBackgroundPage \ | 2556 #define MAYBE_WebViewInBackgroundPage \ |
2550 DISABLED_WebViewInBackgroundPage | 2557 DISABLED_WebViewInBackgroundPage |
2551 #else | 2558 #else |
2552 #define MAYBE_WebViewInBackgroundPage WebViewInBackgroundPage | 2559 #define MAYBE_WebViewInBackgroundPage WebViewInBackgroundPage |
2553 #endif | 2560 #endif |
2554 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_WebViewInBackgroundPage) { | 2561 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_WebViewInBackgroundPage) { |
2555 ASSERT_TRUE(RunExtensionTest("platform_apps/web_view/background")) | 2562 ASSERT_TRUE(RunExtensionTest("platform_apps/web_view/background")) |
2556 << message_; | 2563 << message_; |
2557 } | 2564 } |
OLD | NEW |