OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 <deque> | 5 #include <deque> |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
9 #include "base/stringprintf.h" | 9 #include "base/stringprintf.h" |
10 #include "base/string_util.h" | 10 #include "base/string_util.h" |
(...skipping 834 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
845 // Checks that the prerendering of a page is canceled correctly when a | 845 // Checks that the prerendering of a page is canceled correctly when a |
846 // Javascript alert is called. | 846 // Javascript alert is called. |
847 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderAlertAfterOnload) { | 847 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderAlertAfterOnload) { |
848 PrerenderTestURL("files/prerender/prerender_alert_after_onload.html", | 848 PrerenderTestURL("files/prerender/prerender_alert_after_onload.html", |
849 FINAL_STATUS_JAVASCRIPT_ALERT, | 849 FINAL_STATUS_JAVASCRIPT_ALERT, |
850 1); | 850 1); |
851 } | 851 } |
852 | 852 |
853 // Checks that plugins are not loaded while a page is being preloaded, but | 853 // Checks that plugins are not loaded while a page is being preloaded, but |
854 // are loaded when the page is displayed. | 854 // are loaded when the page is displayed. |
855 #if defined(OS_MACOSX) | 855 #if defined(USE_AURA) |
| 856 // http://crbug.com/103496 |
| 857 #define MAYBE_PrerenderDelayLoadPlugin DISABLED_PrerenderDelayLoadPlugin |
| 858 #elif defined(OS_MACOSX) |
856 // http://crbug.com/100514 | 859 // http://crbug.com/100514 |
857 #define MAYBE_PrerenderDelayLoadPlugin FAILS_PrerenderDelayLoadPlugin | 860 #define MAYBE_PrerenderDelayLoadPlugin FAILS_PrerenderDelayLoadPlugin |
858 #else | 861 #else |
859 #define MAYBE_PrerenderDelayLoadPlugin PrerenderDelayLoadPlugin | 862 #define MAYBE_PrerenderDelayLoadPlugin PrerenderDelayLoadPlugin |
860 #endif | 863 #endif |
861 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, MAYBE_PrerenderDelayLoadPlugin) { | 864 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, MAYBE_PrerenderDelayLoadPlugin) { |
862 PrerenderTestURL("files/prerender/plugin_delay_load.html", | 865 PrerenderTestURL("files/prerender/plugin_delay_load.html", |
863 FINAL_STATUS_USED, | 866 FINAL_STATUS_USED, |
864 1); | 867 1); |
865 NavigateToDestURL(); | 868 NavigateToDestURL(); |
866 } | 869 } |
867 | 870 |
868 // Checks that plugins are not loaded on prerendering pages when click-to-play | 871 // Checks that plugins are not loaded on prerendering pages when click-to-play |
869 // is enabled. | 872 // is enabled. |
870 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClickToPlay) { | 873 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClickToPlay) { |
871 // Enable click-to-play. | 874 // Enable click-to-play. |
872 browser()->profile()->GetHostContentSettingsMap()->SetDefaultContentSetting( | 875 browser()->profile()->GetHostContentSettingsMap()->SetDefaultContentSetting( |
873 CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_ASK); | 876 CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_ASK); |
874 | 877 |
875 PrerenderTestURL("files/prerender/prerender_plugin_click_to_play.html", | 878 PrerenderTestURL("files/prerender/prerender_plugin_click_to_play.html", |
876 FINAL_STATUS_USED, | 879 FINAL_STATUS_USED, |
877 1); | 880 1); |
878 NavigateToDestURL(); | 881 NavigateToDestURL(); |
879 } | 882 } |
880 | 883 |
881 // Checks that plugins in an iframe are not loaded while a page is | 884 // Checks that plugins in an iframe are not loaded while a page is |
882 // being preloaded, but are loaded when the page is displayed. | 885 // being preloaded, but are loaded when the page is displayed. |
883 #if defined(OS_MACOSX) | 886 #if defined(USE_AURA) |
| 887 // http://crbug.com/103496 |
| 888 #define MAYBE_PrerenderIframeDelayLoadPlugin \ |
| 889 DISABLED_PrerenderIframeDelayLoadPlugin |
| 890 #elif defined(OS_MACOSX) |
884 // http://crbug.com/100514 | 891 // http://crbug.com/100514 |
885 #define MAYBE_PrerenderIframeDelayLoadPlugin \ | 892 #define MAYBE_PrerenderIframeDelayLoadPlugin \ |
886 FAILS_PrerenderIframeDelayLoadPlugin | 893 FAILS_PrerenderIframeDelayLoadPlugin |
887 #else | 894 #else |
888 #define MAYBE_PrerenderIframeDelayLoadPlugin PrerenderIframeDelayLoadPlugin | 895 #define MAYBE_PrerenderIframeDelayLoadPlugin PrerenderIframeDelayLoadPlugin |
889 #endif | 896 #endif |
890 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, | 897 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, |
891 MAYBE_PrerenderIframeDelayLoadPlugin) { | 898 MAYBE_PrerenderIframeDelayLoadPlugin) { |
892 PrerenderTestURL("files/prerender/prerender_iframe_plugin_delay_load.html", | 899 PrerenderTestURL("files/prerender/prerender_iframe_plugin_delay_load.html", |
893 FINAL_STATUS_USED, | 900 FINAL_STATUS_USED, |
(...skipping 950 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1844 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, DISABLED_PrerenderSessionStorage) { | 1851 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, DISABLED_PrerenderSessionStorage) { |
1845 set_loader_path("files/prerender/prerender_loader_with_session_storage.html"); | 1852 set_loader_path("files/prerender/prerender_loader_with_session_storage.html"); |
1846 PrerenderTestURL(GetCrossDomainTestUrl("files/prerender/prerender_page.html"), | 1853 PrerenderTestURL(GetCrossDomainTestUrl("files/prerender/prerender_page.html"), |
1847 FINAL_STATUS_USED, | 1854 FINAL_STATUS_USED, |
1848 1); | 1855 1); |
1849 NavigateToDestURL(); | 1856 NavigateToDestURL(); |
1850 GoBackToPageBeforePrerender(browser()); | 1857 GoBackToPageBeforePrerender(browser()); |
1851 } | 1858 } |
1852 | 1859 |
1853 } // namespace prerender | 1860 } // namespace prerender |
OLD | NEW |