Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1093)

Side by Side Diff: chrome/browser/prerender/prerender_browsertest.cc

Issue 7055022: Mark prerender download tests as flaky again. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/string_util.h" 9 #include "base/string_util.h"
10 #include "chrome/browser/content_settings/host_content_settings_map.h" 10 #include "chrome/browser/content_settings/host_content_settings_map.h"
(...skipping 641 matching lines...) Expand 10 before | Expand all | Expand 10 after
652 "files/prerender/prerender_with_iframe.html", 652 "files/prerender/prerender_with_iframe.html",
653 replacement_text, 653 replacement_text,
654 &replacement_path)); 654 &replacement_path));
655 PrerenderTestURL(replacement_path, FINAL_STATUS_USED, 1); 655 PrerenderTestURL(replacement_path, FINAL_STATUS_USED, 1);
656 EXPECT_FALSE(UrlIsInPrerenderManager(https_url)); 656 EXPECT_FALSE(UrlIsInPrerenderManager(https_url));
657 NavigateToDestURL(); 657 NavigateToDestURL();
658 } 658 }
659 659
660 // Prerenders a page that contains an automatic download triggered through an 660 // Prerenders a page that contains an automatic download triggered through an
661 // iframe. This should not prerender successfully. 661 // iframe. This should not prerender successfully.
662 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderDownloadIframe) { 662 // Flaky: http://crbug.com/81985
663 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, FLAKY_PrerenderDownloadIframe) {
663 PrerenderTestURL("files/prerender/prerender_download_iframe.html", 664 PrerenderTestURL("files/prerender/prerender_download_iframe.html",
664 FINAL_STATUS_DOWNLOAD, 665 FINAL_STATUS_DOWNLOAD,
665 1); 666 1);
666 } 667 }
667 668
668 // Prerenders a page that contains an automatic download triggered through 669 // Prerenders a page that contains an automatic download triggered through
669 // Javascript changing the window.location. This should not prerender 670 // Javascript changing the window.location. This should not prerender
670 // successfully 671 // successfully
671 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderDownloadLocation) { 672 // Flaky: http://crbug.com/81985
673 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
674 FLAKY_PrerenderDownloadLocation) {
672 PrerenderTestURL(CreateClientRedirect("files/download-test1.lib"), 675 PrerenderTestURL(CreateClientRedirect("files/download-test1.lib"),
673 FINAL_STATUS_DOWNLOAD, 676 FINAL_STATUS_DOWNLOAD,
674 1); 677 1);
675 } 678 }
676 679
677 // Prerenders a page that contains an automatic download triggered through a 680 // Prerenders a page that contains an automatic download triggered through a
678 // client-issued redirect. This should not prerender successfully. 681 // client-issued redirect. This should not prerender successfully.
679 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderDownloadClientRedirect) { 682 // Flaky: http://crbug.com/81985
683 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
684 FLAKY_PrerenderDownloadClientRedirect) {
680 PrerenderTestURL("files/prerender/prerender_download_refresh.html", 685 PrerenderTestURL("files/prerender/prerender_download_refresh.html",
681 FINAL_STATUS_DOWNLOAD, 686 FINAL_STATUS_DOWNLOAD,
682 1); 687 1);
683 } 688 }
684 689
685 // Checks that the referrer is set when prerendering. 690 // Checks that the referrer is set when prerendering.
686 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderReferrer) { 691 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderReferrer) {
687 PrerenderTestURL("files/prerender/prerender_referrer.html", 692 PrerenderTestURL("files/prerender/prerender_referrer.html",
688 FINAL_STATUS_USED, 693 FINAL_STATUS_USED,
689 1); 694 1);
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
945 950
946 // Checks that prerendering a JPG works correctly. 951 // Checks that prerendering a JPG works correctly.
947 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderImageJpeg) { 952 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderImageJpeg) {
948 DisableJavascriptCalls(); 953 DisableJavascriptCalls();
949 PrerenderTestURL("files/prerender/image.jpeg", FINAL_STATUS_USED, 1); 954 PrerenderTestURL("files/prerender/image.jpeg", FINAL_STATUS_USED, 1);
950 NavigateToDestURL(); 955 NavigateToDestURL();
951 } 956 }
952 957
953 // Checks that a prerender of a CRX will result in a cancellation due to 958 // Checks that a prerender of a CRX will result in a cancellation due to
954 // download. 959 // download.
955 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderCrx) { 960 // Flaky: http://crbug.com/81985
961 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, FLAKY_PrerenderCrx) {
956 PrerenderTestURL("files/prerender/extension.crx", FINAL_STATUS_DOWNLOAD, 1); 962 PrerenderTestURL("files/prerender/extension.crx", FINAL_STATUS_DOWNLOAD, 1);
957 } 963 }
958 964
959 // Checks that xhr GET requests allow prerenders. 965 // Checks that xhr GET requests allow prerenders.
960 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderXhrGet) { 966 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderXhrGet) {
961 PrerenderTestURL("files/prerender/prerender_xhr_get.html", 967 PrerenderTestURL("files/prerender/prerender_xhr_get.html",
962 FINAL_STATUS_USED, 968 FINAL_STATUS_USED,
963 1); 969 1);
964 NavigateToDestURL(); 970 NavigateToDestURL();
965 } 971 }
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
1073 } 1079 }
1074 1080
1075 // Checks that we cancel correctly when window.print() is called. 1081 // Checks that we cancel correctly when window.print() is called.
1076 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderPrint) { 1082 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderPrint) {
1077 PrerenderTestURL("files/prerender/prerender_print.html", 1083 PrerenderTestURL("files/prerender/prerender_print.html",
1078 FINAL_STATUS_WINDOW_PRINT, 1084 FINAL_STATUS_WINDOW_PRINT,
1079 1); 1085 1);
1080 } 1086 }
1081 1087
1082 } // namespace prerender 1088 } // namespace prerender
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698