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

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

Issue 7015051: Re-land: (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
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/memory/scoped_temp_dir.h" 8 #include "base/memory/scoped_temp_dir.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
(...skipping 850 matching lines...) Expand 10 before | Expand all | Expand 10 after
861 861
862 // Checks that prerenderers will terminate when a video tag is inserted via 862 // Checks that prerenderers will terminate when a video tag is inserted via
863 // javascript. 863 // javascript.
864 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderHTML5VideoJs) { 864 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderHTML5VideoJs) {
865 PrerenderTestURL("files/prerender/prerender_html5_video_script.html", 865 PrerenderTestURL("files/prerender/prerender_html5_video_script.html",
866 FINAL_STATUS_HTML5_MEDIA, 866 FINAL_STATUS_HTML5_MEDIA,
867 1); 867 1);
868 } 868 }
869 869
870 // Checks that scripts can retrieve the correct window size while prerendering. 870 // Checks that scripts can retrieve the correct window size while prerendering.
871 #if defined(TOOLKIT_VIEWS)
872 // TODO(beng): Widget hierarchy split causes this to fail http://crbug.com/82363
873 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, DISABLED_PrerenderWindowSize) {
874 #else
871 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderWindowSize) { 875 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderWindowSize) {
876 #endif
872 PrerenderTestURL("files/prerender/prerender_size.html", 877 PrerenderTestURL("files/prerender/prerender_size.html",
873 FINAL_STATUS_USED, 878 FINAL_STATUS_USED,
874 1); 879 1);
875 NavigateToDestURL(); 880 NavigateToDestURL();
876 } 881 }
877 882
878 // Checks that prerenderers will terminate when the RenderView crashes. 883 // Checks that prerenderers will terminate when the RenderView crashes.
879 // Note that the prerendering RenderView will be redirected to about:crash. 884 // Note that the prerendering RenderView will be redirected to about:crash.
880 // Disabled, http://crbug.com/80561 885 // Disabled, http://crbug.com/80561
881 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, DISABLED_PrerenderRendererCrash) { 886 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, DISABLED_PrerenderRendererCrash) {
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
1065 std::string replacement_path; 1070 std::string replacement_path;
1066 ASSERT_TRUE(net::TestServer::GetFilePathWithReplacements( 1071 ASSERT_TRUE(net::TestServer::GetFilePathWithReplacements(
1067 "files/prerender/prerender_with_iframe.html", 1072 "files/prerender/prerender_with_iframe.html",
1068 replacement_text, 1073 replacement_text,
1069 &replacement_path)); 1074 &replacement_path));
1070 PrerenderTestURL(replacement_path, FINAL_STATUS_USED, 1); 1075 PrerenderTestURL(replacement_path, FINAL_STATUS_USED, 1);
1071 NavigateToDestURL(); 1076 NavigateToDestURL();
1072 } 1077 }
1073 1078
1074 } // namespace prerender 1079 } // namespace prerender
OLDNEW
« no previous file with comments | « chrome/browser/first_run/try_chrome_dialog_view.cc ('k') | chrome/browser/ui/browser_list_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698