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/process/process.h" | 6 #include "base/process/process.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/app/chrome_command_ids.h" | 9 #include "chrome/app/chrome_command_ids.h" |
10 #include "chrome/browser/apps/app_browsertest_util.h" | 10 #include "chrome/browser/apps/app_browsertest_util.h" |
(...skipping 963 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
974 | 974 |
975 IN_PROC_BROWSER_TEST_F(WebViewDPITest, Shim_TestAutosizeRemoveAttributes) { | 975 IN_PROC_BROWSER_TEST_F(WebViewDPITest, Shim_TestAutosizeRemoveAttributes) { |
976 TestHelper("testAutosizeRemoveAttributes", "web_view/shim", NO_TEST_SERVER); | 976 TestHelper("testAutosizeRemoveAttributes", "web_view/shim", NO_TEST_SERVER); |
977 } | 977 } |
978 | 978 |
979 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestAutosizeRemoveAttributes) { | 979 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestAutosizeRemoveAttributes) { |
980 TestHelper("testAutosizeRemoveAttributes", "web_view/shim", NO_TEST_SERVER); | 980 TestHelper("testAutosizeRemoveAttributes", "web_view/shim", NO_TEST_SERVER); |
981 } | 981 } |
982 | 982 |
983 // This test is disabled due to being flaky. http://crbug.com/282116 | 983 // This test is disabled due to being flaky. http://crbug.com/282116 |
984 #if defined(OS_WIN) || defined(OS_MACOSX) | |
985 #define MAYBE_Shim_TestAutosizeWithPartialAttributes \ | |
986 DISABLED_Shim_TestAutosizeWithPartialAttributes | |
987 #else | |
988 #define MAYBE_Shim_TestAutosizeWithPartialAttributes \ | |
989 Shim_TestAutosizeWithPartialAttributes | |
990 #endif | |
991 IN_PROC_BROWSER_TEST_F(WebViewTest, | 984 IN_PROC_BROWSER_TEST_F(WebViewTest, |
992 MAYBE_Shim_TestAutosizeWithPartialAttributes) { | 985 DISABLED_Shim_TestAutosizeWithPartialAttributes) { |
993 TestHelper("testAutosizeWithPartialAttributes", | 986 TestHelper("testAutosizeWithPartialAttributes", |
994 "web_view/shim", | 987 "web_view/shim", |
995 NO_TEST_SERVER); | 988 NO_TEST_SERVER); |
996 } | 989 } |
997 | 990 |
998 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestAPIMethodExistence) { | 991 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestAPIMethodExistence) { |
999 TestHelper("testAPIMethodExistence", "web_view/shim", NO_TEST_SERVER); | 992 TestHelper("testAPIMethodExistence", "web_view/shim", NO_TEST_SERVER); |
1000 } | 993 } |
1001 | 994 |
1002 // Tests the existence of WebRequest API event objects on the request | 995 // Tests the existence of WebRequest API event objects on the request |
(...skipping 1739 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2742 IN_PROC_BROWSER_TEST_F(WebViewTest, AllowTransparencyAndAllowScalingPropagate) { | 2735 IN_PROC_BROWSER_TEST_F(WebViewTest, AllowTransparencyAndAllowScalingPropagate) { |
2743 LoadAppWithGuest("web_view/simple"); | 2736 LoadAppWithGuest("web_view/simple"); |
2744 | 2737 |
2745 ASSERT_TRUE(!!GetGuestWebContents()); | 2738 ASSERT_TRUE(!!GetGuestWebContents()); |
2746 extensions::WebViewGuest* guest = | 2739 extensions::WebViewGuest* guest = |
2747 extensions::WebViewGuest::FromWebContents(GetGuestWebContents()); | 2740 extensions::WebViewGuest::FromWebContents(GetGuestWebContents()); |
2748 ASSERT_TRUE(guest->allow_transparency()); | 2741 ASSERT_TRUE(guest->allow_transparency()); |
2749 ASSERT_TRUE(guest->allow_scaling()); | 2742 ASSERT_TRUE(guest->allow_scaling()); |
2750 } | 2743 } |
2751 | 2744 |
OLD | NEW |