| 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/native_app_window.h" | 5 #include "apps/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/browser/apps/app_browsertest_util.h" | 9 #include "chrome/browser/apps/app_browsertest_util.h" |
| 10 #include "chrome/browser/automation/automation_util.h" | 10 #include "chrome/browser/automation/automation_util.h" |
| (...skipping 587 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 598 #endif | 598 #endif |
| 599 | 599 |
| 600 ASSERT_TRUE(RunPlatformAppTest("platform_apps/web_view/autosize")) | 600 ASSERT_TRUE(RunPlatformAppTest("platform_apps/web_view/autosize")) |
| 601 << message_; | 601 << message_; |
| 602 } | 602 } |
| 603 | 603 |
| 604 #if !defined(OS_CHROMEOS) | 604 #if !defined(OS_CHROMEOS) |
| 605 // This test ensures <webview> doesn't crash in SW rendering when autosize is | 605 // This test ensures <webview> doesn't crash in SW rendering when autosize is |
| 606 // turned on. | 606 // turned on. |
| 607 IN_PROC_BROWSER_TEST_F(WebViewTest, AutoSizeSW) { | 607 IN_PROC_BROWSER_TEST_F(WebViewTest, AutoSizeSW) { |
| 608 #if defined(OS_WIN) |
| 609 // Flaky on XP bot http://crbug.com/299507 |
| 610 if (base::win::GetVersion() <= base::win::VERSION_XP) |
| 611 return; |
| 612 #endif |
| 608 ASSERT_TRUE(RunPlatformAppTest("platform_apps/web_view/autosize")) | 613 ASSERT_TRUE(RunPlatformAppTest("platform_apps/web_view/autosize")) |
| 609 << message_; | 614 << message_; |
| 610 } | 615 } |
| 611 #endif | 616 #endif |
| 612 | 617 |
| 613 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestAutosizeAfterNavigation) { | 618 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestAutosizeAfterNavigation) { |
| 614 TestHelper("testAutosizeAfterNavigation", | 619 TestHelper("testAutosizeAfterNavigation", |
| 615 "DoneShimTest.PASSED", | 620 "DoneShimTest.PASSED", |
| 616 "DoneShimTest.FAILED", | 621 "DoneShimTest.FAILED", |
| 617 "web_view/shim"); | 622 "web_view/shim"); |
| (...skipping 1200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1818 } | 1823 } |
| 1819 }; | 1824 }; |
| 1820 | 1825 |
| 1821 IN_PROC_BROWSER_TEST_F(WebViewPluginTest, TestLoadPluginEvent) { | 1826 IN_PROC_BROWSER_TEST_F(WebViewPluginTest, TestLoadPluginEvent) { |
| 1822 TestHelper("testPluginLoadPermission", | 1827 TestHelper("testPluginLoadPermission", |
| 1823 "DoneShimTest.PASSED", | 1828 "DoneShimTest.PASSED", |
| 1824 "DoneShimTest.FAILED", | 1829 "DoneShimTest.FAILED", |
| 1825 "web_view/shim"); | 1830 "web_view/shim"); |
| 1826 } | 1831 } |
| 1827 #endif // defined(ENABLE_PLUGINS) | 1832 #endif // defined(ENABLE_PLUGINS) |
| OLD | NEW |